diff options
| author | Richard Linden <none@none> | 2011-10-20 12:05:03 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2011-10-20 12:05:03 -0700 |
| commit | c43681ca8f1619d2116c2d5caef4099c5a1eba04 (patch) | |
| tree | 8a1d1390b283d6c217b6edce47513b19a698edd1 /indra | |
| parent | aa3f5edc83a6a20f0473fff6f28fdad6f5406dc2 (diff) | |
EXP-1440 FIX Floaters can offset from call dialog and show offscreen for default positions
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/llui/llfloater.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/llui/llfloater.cpp b/indra/llui/llfloater.cpp index bd537bfb19..ddc90b0378 100644 --- a/indra/llui/llfloater.cpp +++ b/indra/llui/llfloater.cpp @@ -875,7 +875,8 @@ bool LLFloater::applyRectControl() { bool saved_rect = false; - if (LLFloaterReg::getLastFloaterInGroup(mInstanceName)) + LLFloater* last_in_group = LLFloaterReg::getLastFloaterInGroup(mInstanceName); + if (last_in_group && last_in_group != this) { // other floaters in our group, position ourselves relative to them and don't save the rect mRectControl.clear(); @@ -1589,6 +1590,7 @@ void LLFloater::setDocked(bool docked, bool pop_on_undock) if (mDocked) { setMinimized(FALSE); + mOpenPositioning = LLFloaterEnums::OPEN_POSITIONING_NONE; } updateTitleButtons(); |