From 7068d77ca32f6f96db546b1a0deca8d006cd9149 Mon Sep 17 00:00:00 2001 From: Andrew Dyukov Date: Mon, 14 Dec 2009 21:38:22 +0200 Subject: Fixed minor bug EXT-3045 ("Move" buttin seems to be unpressed while Move controls panel is active (refer to screenshot)). --HG-- branch : product-engine --- indra/newview/llmoveview.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'indra/newview') diff --git a/indra/newview/llmoveview.cpp b/indra/newview/llmoveview.cpp index c17427bec1..4e4646c052 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) { @@ -492,6 +495,7 @@ void LLFloaterMove::onOpen(const LLSD& key) //virtual void LLFloaterMove::setDocked(bool docked, bool pop_on_undock/* = true*/) { + LLDockableFloater::setDocked(docked, pop_on_undock); LLTransientDockableFloater::setDocked(docked, pop_on_undock); } -- cgit v1.2.3