diff options
| author | Richard Nelson <richard@lindenlab.com> | 2011-10-19 17:47:05 -0700 |
|---|---|---|
| committer | Richard Nelson <richard@lindenlab.com> | 2011-10-19 17:47:05 -0700 |
| commit | ea1c3218e2ca70623ef348dcae36d667e095394f (patch) | |
| tree | 30bccfb5de1278c0e085863e3231684b25083c23 /indra/llui | |
| parent | 2bf9acabfb534821e5302848860ef6a01af23b1b (diff) | |
EXP-1411 FIX "Speak" button enabled in regions with disabled voice
EXP-1424 FIX Floaters open on top of one another in default position with no offset
floaters now stack with their own kind preferentially
Diffstat (limited to 'indra/llui')
| -rw-r--r-- | indra/llui/llfloater.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/indra/llui/llfloater.cpp b/indra/llui/llfloater.cpp index 29d05b8002..c1faa304a8 100644 --- a/indra/llui/llfloater.cpp +++ b/indra/llui/llfloater.cpp @@ -685,7 +685,12 @@ void LLFloater::openFloater(const LLSD& key) } else { - applyControlsAndPosition(LLFloaterReg::getLastFloaterCascading()); + LLFloater* floater_to_stack = LLFloaterReg::getLastFloaterInGroup(mInstanceName); + if (!floater_to_stack) + { + floater_to_stack = LLFloaterReg::getLastFloaterCascading(); + } + applyControlsAndPosition(floater_to_stack); setMinimized(FALSE); setVisibleAndFrontmost(mAutoFocus); } |