diff options
| author | Merov Linden <merov@lindenlab.com> | 2011-10-24 15:45:43 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2011-10-24 15:45:43 -0700 |
| commit | ec06835e8acf21e2d4b0f05fca1634a66fafdb46 (patch) | |
| tree | 3a93d8a109c45408eaa085ccd0588e988bcc2ece /indra | |
| parent | b3c1e967ee9aa1b19622fe7b40e73417ac931b1d (diff) | |
| parent | d3d92420d6fb925b02d2ccf47c4ecc644b8b4628 (diff) | |
Pull from richard/viewer-experience-fui
Diffstat (limited to 'indra')
| -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); } |