summaryrefslogtreecommitdiff
path: root/indra/newview/llmoveview.cpp
diff options
context:
space:
mode:
authorJames Cook <james@lindenlab.com>2009-12-16 16:40:06 -0800
committerJames Cook <james@lindenlab.com>2009-12-16 16:40:06 -0800
commit3c06dc4df2d9ee11e7d346f902d34eaee17161a5 (patch)
tree40c5342da322116d093268e0437736f860d62e0d /indra/newview/llmoveview.cpp
parent4c0d5200bc7a53537f9ee7028e74c1feb4abc52e (diff)
parentc08699f900bf1560f61ea05e44449e90bb02c708 (diff)
Merge
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)
{