summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorRichard Linden <none@none>2011-10-24 17:30:44 -0700
committerRichard Linden <none@none>2011-10-24 17:30:44 -0700
commit94d34aef5b2862a587095a664b6d6f33079dcd93 (patch)
tree639747620667e05b8c642507e62592846b3dbdb7 /indra
parent8874ac39c1928bcb70c4f63cd3cfaeb75712d00e (diff)
parente356f5c0dce81aff113d562485721305d21ece77 (diff)
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience-fui
Diffstat (limited to 'indra')
-rw-r--r--indra/llui/llfloater.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llui/llfloater.cpp b/indra/llui/llfloater.cpp
index 2c707afa8f..432397d3e9 100644
--- a/indra/llui/llfloater.cpp
+++ b/indra/llui/llfloater.cpp
@@ -1070,7 +1070,7 @@ void LLFloater::handleReshape(const LLRect& new_rect, bool by_user)
const LLRect old_rect = getRect();
LLView::handleReshape(new_rect, by_user);
- if (by_user)
+ if (by_user && !isMinimized())
{
storeRectControl();
mOpenPositioning = LLFloaterEnums::OPEN_POSITIONING_NONE;