From 943f8afa09480629ad659de9601b36b3dc565246 Mon Sep 17 00:00:00 2001
From: Mike Antipov <mantipov@productengine.com>
Date: Fri, 29 Jan 2010 14:25:50 +0200
Subject: 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
---
 indra/newview/llmoveview.cpp | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'indra')

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
 	}
-- 
cgit v1.2.3