summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Nelson <richard@lindenlab.com>2009-07-09 01:07:03 +0000
committerRichard Nelson <richard@lindenlab.com>2009-07-09 01:07:03 +0000
commit75e1187f3182e726e15ace55d38885a6385d4b33 (patch)
tree1402aef64c24e2c9627b65f0119aee4fe2587494
parent3c956af81c88faa78d1ce4bd6ce6e361c9eea665 (diff)
EXT-126 - Grayed empty field appears after minimize the 'Search Second Life' dlg
EXT-124 - Empty local chat window appears after the viewer was resized reviewed by Austin
-rw-r--r--indra/llui/llfloater.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/llui/llfloater.cpp b/indra/llui/llfloater.cpp
index c8bbdb0a56..e0a4c08753 100644
--- a/indra/llui/llfloater.cpp
+++ b/indra/llui/llfloater.cpp
@@ -2177,7 +2177,8 @@ void LLFloaterView::adjustToFitScreen(LLFloater* floater, BOOL allow_partial_out
// convert to local coordinate frame
LLRect snap_rect_local = getLocalSnapRect();
- if( floater->isResizable() )
+ // only automatically resize non-minimized, resizable floaters
+ if( floater->isResizable() && !floater->isMinimized() )
{
LLRect view_rect = floater->getRect();
S32 old_width = view_rect.getWidth();