diff options
| author | Debi King (Dessie) <dessie@lindenlab.com> | 2011-11-10 13:10:34 -0500 |
|---|---|---|
| committer | Debi King (Dessie) <dessie@lindenlab.com> | 2011-11-10 13:10:34 -0500 |
| commit | 2b5eeffcb8b75487226159f1b3438fe9dd87f891 (patch) | |
| tree | 63151cf9e2ec86647a69b1dd04a6fa3a23ac4a88 /indra/llui/llfloater.cpp | |
| parent | 66fdc6af3e6d0fb0438ef9721b5ca311be4c08a4 (diff) | |
| parent | 0f79a053c329e9b3206527badfc66e02605506d6 (diff) | |
reconciled .hgtags
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; |