summaryrefslogtreecommitdiff
path: root/indra/newview/llmoveview.cpp
diff options
context:
space:
mode:
authorEric M. Tulla (BigPapi) <tulla@lindenlab.com>2009-12-15 15:41:51 -0500
committerEric M. Tulla (BigPapi) <tulla@lindenlab.com>2009-12-15 15:41:51 -0500
commit08495d3f63e1e926e44185be07269ed40363024a (patch)
tree8e32278f96a14b36a4215e7fac16f68d072da961 /indra/newview/llmoveview.cpp
parent870d4449f5eec1c2a7e5e4627a0433846ab256aa (diff)
parent06f8017674295191d3c4400eacb36e34a167ffa5 (diff)
Merging in latest PE changes from https://hg.aws.productengine.com/secondlife/viewer-2-0/
Diffstat (limited to 'indra/newview/llmoveview.cpp')
-rw-r--r--indra/newview/llmoveview.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/llmoveview.cpp b/indra/newview/llmoveview.cpp
index c17427bec1..22201aecb2 100644
--- a/indra/newview/llmoveview.cpp
+++ b/indra/newview/llmoveview.cpp
@@ -160,9 +160,12 @@ void LLFloaterMove::setEnabled(BOOL enabled)
// virtual
void LLFloaterMove::setVisible(BOOL visible)
{
- // Ignore excessive calls of this method (from LLTransientFloaterMgr?).
+ // Do nothing with Stand/Stop Flying panel in excessive calls of this method (from LLTransientFloaterMgr?).
if (getVisible() == visible)
+ {
+ LLTransientDockableFloater::setVisible(visible);
return;
+ }
if (visible)
{