diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-11-15 17:04:37 -0600 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-11-15 17:04:37 -0600 |
| commit | cfb666e9d9eb8945a79e2f7999459267caca36ee (patch) | |
| tree | b02e73c02f6f377c99fffc950d72525516647f52 /indra/llui/llfloater.cpp | |
| parent | 09c74484ae0df267f01610ab4b594e50a01c05c1 (diff) | |
| parent | b493b8cca491c4b7a76f4c98b34272970d3bb58b (diff) | |
merge
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; |