summaryrefslogtreecommitdiff
path: root/indra/newview/llmoveview.cpp
diff options
context:
space:
mode:
authorLeyla Farazha <leyla@lindenlab.com>2009-10-28 17:09:13 -0700
committerLeyla Farazha <leyla@lindenlab.com>2009-10-28 17:09:13 -0700
commit9426de7e10fa7cfe84048ae7dd58a793e981ee33 (patch)
tree3f08086776a8175741f23071333b593992269c45 /indra/newview/llmoveview.cpp
parenta0e766da94d786d306a86667a27728524ca6eedb (diff)
parent74e70f2f23901d524350252519beaef8ed6d42e5 (diff)
merging...
Diffstat (limited to 'indra/newview/llmoveview.cpp')
-rw-r--r--indra/newview/llmoveview.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/newview/llmoveview.cpp b/indra/newview/llmoveview.cpp
index 4fc552c8b1..2b4e35208a 100644
--- a/indra/newview/llmoveview.cpp
+++ b/indra/newview/llmoveview.cpp
@@ -498,7 +498,11 @@ void LLFloaterMove::setDocked(bool docked, bool pop_on_undock/* = true*/)
{
LLDockableFloater::setDocked(docked, pop_on_undock);
bool show_mode_buttons = isDocked() || !gAgent.getFlying();
- updateHeight(show_mode_buttons);
+
+ if (!isMinimized())
+ {
+ updateHeight(show_mode_buttons);
+ }
LLTransientDockableFloater::setDocked(docked, pop_on_undock);
}