summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorRichard Linden <none@none>2012-03-14 15:00:48 -0700
committerRichard Linden <none@none>2012-03-14 15:00:48 -0700
commitb9521a38f11dd9f44f216adb7d02263d25272572 (patch)
tree7158e074a2b8547828670ef13802423c2922f140 /indra
parent3fc4f469edc6b9ce944204d77a97c78f68a4a135 (diff)
CHUI-59 FIX Floater stacking offset only occurs first time a floater is opened
changed stacking logic to attempt to stack against any floater that is cascade head *or* in a cascade group
Diffstat (limited to 'indra')
-rw-r--r--indra/llui/llfloaterreg.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/llui/llfloaterreg.cpp b/indra/llui/llfloaterreg.cpp
index ef55e74166..3d124cf885 100644
--- a/indra/llui/llfloaterreg.cpp
+++ b/indra/llui/llfloaterreg.cpp
@@ -96,7 +96,9 @@ LLFloater* LLFloaterReg::getLastFloaterCascading()
{
LLFloater* inst = *iter;
- if (inst->getVisible() && inst->isPositioning(LLFloaterEnums::POSITIONING_CASCADING))
+ if (inst->getVisible()
+ && (inst->isPositioning(LLFloaterEnums::POSITIONING_CASCADING)
+ || inst->isPositioning(LLFloaterEnums::POSITIONING_CASCADE_GROUP)))
{
if (candidate_rect.mTop > inst->getRect().mTop)
{