diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-05-22 05:39:14 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-05-22 05:39:14 -0400 |
| commit | fba67959fe62512ef0d1e136bb33facc44134b7f (patch) | |
| tree | 79529ccf35a90f6ac431aa770b4d1a509f4b110c /indra | |
| parent | a254d0e9b0af8e6f37fedafa6147b20d5659784f (diff) | |
| parent | 93c68c7c12f2a0d19e94bae833554139f78914e9 (diff) | |
merge changes for DRTVWR-150
Diffstat (limited to 'indra')
| -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() |