diff options
| author | callum <none@none> | 2011-10-24 16:26:45 -0700 |
|---|---|---|
| committer | callum <none@none> | 2011-10-24 16:26:45 -0700 |
| commit | 46082c7d75b0acee167d4f0c0ef6bb2eacdef8d2 (patch) | |
| tree | e6d2ab8803e9f4feb780d88d73d3a867a9f78a40 /indra/llui | |
| parent | 54b16e06a649808cc3bbc94cbe9e9b74211c99f6 (diff) | |
| parent | ec06835e8acf21e2d4b0f05fca1634a66fafdb46 (diff) | |
Merge with head
Diffstat (limited to 'indra/llui')
| -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); } |