diff options
| author | Richard Linden <none@none> | 2012-05-18 21:03:45 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2012-05-18 21:03:45 -0700 |
| commit | 93c68c7c12f2a0d19e94bae833554139f78914e9 (patch) | |
| tree | 404f357413d823529fc9e36178b0e7ea39f0e8c5 /indra | |
| parent | aa0a0542a10ba6faeca34afd6e323b505493d8dc (diff) | |
MAINT-959 FIX [PUBLIC]Trouble resizing tabbed floaters
don't auto position other floater when it is hosted
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() |