summaryrefslogtreecommitdiff
path: root/indra/newview/llmoveview.cpp
diff options
context:
space:
mode:
authorskolb <none@none>2009-12-15 13:31:18 -0800
committerskolb <none@none>2009-12-15 13:31:18 -0800
commitdc9a62b5ab71868c6e9d3ff5c25a773a1135e974 (patch)
treec1f26801e3a1aa5cbbf7a918d5871bd0616442ac /indra/newview/llmoveview.cpp
parent589472a4e91d61b70d1f4184fc1c8e7918fb5606 (diff)
parent89a8182c2cd8d04b85c70d82f654714b83afebb8 (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)
{