diff options
| author | skolb <none@none> | 2009-12-01 13:34:16 -0800 |
|---|---|---|
| committer | skolb <none@none> | 2009-12-01 13:34:16 -0800 |
| commit | 0ab6d36094cc52eea063f6d3b05262c111857f29 (patch) | |
| tree | 95840e0bf49f744520649b030d4bd65b99275bcf /indra/llui/llfloater.cpp | |
| parent | 6dd3f54924b57224298f6d76c766b403d165783f (diff) | |
| parent | 6a888b653a1ee5ed0eeedd8994ff59652f2913aa (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(); } |