diff options
| author | Richard Linden <none@none> | 2011-10-24 14:28:27 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2011-10-24 14:28:27 -0700 |
| commit | d3d92420d6fb925b02d2ccf47c4ecc644b8b4628 (patch) | |
| tree | 931641891820736423acd773e187c507be005e8a | |
| parent | ab9d1982f90c2757b3fc42cd108de3d78c8c8868 (diff) | |
| parent | 399de4f345eb0bf43e84bf0a65b3251798f59a13 (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience-fui
| -rw-r--r-- | indra/llui/llfloater.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llui/llfloater.cpp b/indra/llui/llfloater.cpp index 7100ea13a7..2c707afa8f 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); } |