diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-10-31 11:02:24 -0700 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-10-31 11:02:24 -0700 |
| commit | b39dd46bf3e1c1ccdffe9b4ac4e9ad68b0c3cd69 (patch) | |
| tree | 46e20f39ef94514de3f93a98aba75ad627209e84 /indra/llui/llfloater.cpp | |
| parent | 5d99b221fa8ea75b128e3cc771ed91baa8b11311 (diff) | |
| parent | e86adb53f4df0cb0b9d8ea9b6cc805782d9fcf71 (diff) | |
merge changes for storm-1673
Diffstat (limited to 'indra/llui/llfloater.cpp')
| -rw-r--r-- | indra/llui/llfloater.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llui/llfloater.cpp b/indra/llui/llfloater.cpp index 7100ea13a7..432397d3e9 100644 --- a/indra/llui/llfloater.cpp +++ b/indra/llui/llfloater.cpp @@ -935,7 +935,7 @@ void LLFloater::applyPositioning(LLFloater* other) case LLFloaterEnums::OPEN_POSITIONING_CASCADE_GROUP: case LLFloaterEnums::OPEN_POSITIONING_CASCADING: - if (other != NULL) + if (other != NULL && other != this) { stackWith(*other); } @@ -1070,7 +1070,7 @@ void LLFloater::handleReshape(const LLRect& new_rect, bool by_user) const LLRect old_rect = getRect(); LLView::handleReshape(new_rect, by_user); - if (by_user) + if (by_user && !isMinimized()) { storeRectControl(); mOpenPositioning = LLFloaterEnums::OPEN_POSITIONING_NONE; |