diff options
| author | Kitty Barnett <develop@catznip.com> | 2012-05-30 22:09:17 +0200 |
|---|---|---|
| committer | Kitty Barnett <develop@catznip.com> | 2012-05-30 22:09:17 +0200 |
| commit | e4c54afec2445e43b77fc955f6fc97ec3519b064 (patch) | |
| tree | 99f2d7eeba27d215da6b40476e4316a5c8465690 /indra | |
| parent | 1300f77fdd48d90d09a05058ffdf10df93092391 (diff) | |
| parent | a519e34f02b4b2663fe082ba9ad12f1b423669cb (diff) | |
Merged with viewer-release
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() |