summaryrefslogtreecommitdiff
path: root/indra/newview/llmoveview.cpp
diff options
context:
space:
mode:
authorLoren Shih <seraph@lindenlab.com>2009-12-15 19:20:03 -0500
committerLoren Shih <seraph@lindenlab.com>2009-12-15 19:20:03 -0500
commit073ec70829723e54f822052fe9c6c3e998e8dfca (patch)
tree3d7e782101a2284bcb0fcbf61273f8167d03544f /indra/newview/llmoveview.cpp
parent4d4406820b858d59be670f0ca03bdadefba61c53 (diff)
parente7eae453908e77a959a2ef6fea272107491fe35e (diff)
automated merge viewer2.0->avp
--HG-- branch : avatar-pipeline
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)
{