diff options
| author | callum <none@none> | 2011-10-20 15:03:28 -0700 |
|---|---|---|
| committer | callum <none@none> | 2011-10-20 15:03:28 -0700 |
| commit | 6998c5ebc7aad43d44f1bb6e42e20503c2ff144f (patch) | |
| tree | 916f1c113192211d85a7772b4b62df65f0a613d7 /indra/llui/llfloater.cpp | |
| parent | a1561c20e063060a6a54b4e66968404e4cb15d8a (diff) | |
| parent | 4a90d9f3d6d4491aab8b17bc8dc7f3c8ac90de49 (diff) | |
Merge with head
Diffstat (limited to 'indra/llui/llfloater.cpp')
| -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(); |