summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorMike Antipov <mantipov@productengine.com>2010-01-29 14:25:50 +0200
committerMike Antipov <mantipov@productengine.com>2010-01-29 14:25:50 +0200
commit943f8afa09480629ad659de9601b36b3dc565246 (patch)
treec067766af39b2a7a75f473aef4a77a25efe0915d /indra/newview
parent57e1216f798dbbe479493c19658da36b96622290 (diff)
Fixed normal bug EXT-4743 ('Stop flying' button disappears if minimize undocked movement controls)
- synchronized visibility of "stand_stop_flying_container" with a panel visibility when it is reparented from the Move Floater to container. --HG-- branch : product-engine
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llmoveview.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llmoveview.cpp b/indra/newview/llmoveview.cpp
index 5981baab60..4bf2bac649 100644
--- a/indra/newview/llmoveview.cpp
+++ b/indra/newview/llmoveview.cpp
@@ -651,6 +651,9 @@ void LLPanelStandStopFlying::reparent(LLFloaterMove* move_view)
// Detach from movement controls.
parent->removeChild(this);
mOriginalParent.get()->addChild(this);
+ // update parent with self visibility (it is changed in setVisible()). EXT-4743
+ mOriginalParent.get()->setVisible(getVisible());
+
mAttached = false;
updatePosition(); // don't defer until next draw() to avoid flicker
}