diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-05-30 13:55:53 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-05-30 13:55:53 -0400 |
| commit | f09bd7669fcf976edf82c3ce70b26ea044019c67 (patch) | |
| tree | bfce61c5c323daad6c9ffd20c33e62678b15f3eb /indra/llui | |
| parent | 589218ecd65af1e1027ffe717ed607493a5c2ca7 (diff) | |
| parent | a519e34f02b4b2663fe082ba9ad12f1b423669cb (diff) | |
merge up to 3.3.2-release
Diffstat (limited to 'indra/llui')
| -rw-r--r-- | indra/llui/llfloater.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/indra/llui/llfloater.cpp b/indra/llui/llfloater.cpp index a8a3a1f906..8ca1e685a9 100644 --- a/indra/llui/llfloater.cpp +++ b/indra/llui/llfloater.cpp @@ -3307,8 +3307,11 @@ void LLFloater::stackWith(LLFloater& other) setShape(next_rect); - other.mPositioning = LLFloaterEnums::POSITIONING_CASCADE_GROUP; - other.setFollows(FOLLOWS_LEFT | FOLLOWS_TOP); + if (!other.getHost()) + { + other.mPositioning = LLFloaterEnums::POSITIONING_CASCADE_GROUP; + other.setFollows(FOLLOWS_LEFT | FOLLOWS_TOP); + } } void LLFloater::applyRelativePosition() |