diff options
| author | James Cook <james@lindenlab.com> | 2009-11-28 21:02:55 -0800 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2009-11-28 21:02:55 -0800 |
| commit | e8b436591ad198a5aa37d51077e2d5b0d5b62562 (patch) | |
| tree | 196a32ac8cc9b67809201e0d762eee4b47a8cb9e /indra/llui/llfloater.cpp | |
| parent | 0e34bc413aa562acf97b77333fb9a1f0ec9b55f0 (diff) | |
| parent | 9d52d15db8b61ff3172fadb1b82cd39f892251c5 (diff) | |
merge
Diffstat (limited to 'indra/llui/llfloater.cpp')
| -rw-r--r-- | indra/llui/llfloater.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/indra/llui/llfloater.cpp b/indra/llui/llfloater.cpp index 8cf65fe76a..36a9e0a650 100644 --- a/indra/llui/llfloater.cpp +++ b/indra/llui/llfloater.cpp @@ -2347,8 +2347,7 @@ void LLFloaterView::adjustToFitScreen(LLFloater* floater, BOOL allow_partial_out } LLRect::tCoordType screen_width = getSnapRect().getWidth(); LLRect::tCoordType screen_height = getSnapRect().getHeight(); - // convert to local coordinate frame - LLRect snap_rect_local = getLocalSnapRect(); + // only automatically resize non-minimized, resizable floaters if( floater->isResizable() && !floater->isMinimized() ) @@ -2388,7 +2387,7 @@ void LLFloaterView::adjustToFitScreen(LLFloater* floater, BOOL allow_partial_out } // move window fully onscreen - if (floater->translateIntoRect( snap_rect_local, allow_partial_outside )) + if (floater->translateIntoRect( getLocalRect(), allow_partial_outside )) { floater->clearSnapTarget(); } |