summaryrefslogtreecommitdiff
path: root/indra/llui
diff options
context:
space:
mode:
authorRichard Linden <none@none>2011-10-20 17:33:09 -0700
committerRichard Linden <none@none>2011-10-20 17:33:09 -0700
commit03d0c6d35c7a81fbedeb724f60a63611fd4b464f (patch)
tree51f2add950e30b0d40e238bda366aa99a9475c67 /indra/llui
parent4166c3d06f4941fb45a22075fefa0bf9b189135d (diff)
EXP-1431 FIX Default positions for floaters follows additional open Inventory windows
Diffstat (limited to 'indra/llui')
-rw-r--r--indra/llui/llfloater.cpp3
-rw-r--r--indra/llui/llfloater.h2
2 files changed, 3 insertions, 2 deletions
diff --git a/indra/llui/llfloater.cpp b/indra/llui/llfloater.cpp
index ddc90b0378..7100ea13a7 100644
--- a/indra/llui/llfloater.cpp
+++ b/indra/llui/llfloater.cpp
@@ -880,7 +880,7 @@ bool LLFloater::applyRectControl()
{
// other floaters in our group, position ourselves relative to them and don't save the rect
mRectControl.clear();
- mOpenPositioning = LLFloaterEnums::OPEN_POSITIONING_CASCADING;
+ mOpenPositioning = LLFloaterEnums::OPEN_POSITIONING_CASCADE_GROUP;
}
else if (mRectControl.size() > 1)
{
@@ -933,6 +933,7 @@ void LLFloater::applyPositioning(LLFloater* other)
}
break;
+ case LLFloaterEnums::OPEN_POSITIONING_CASCADE_GROUP:
case LLFloaterEnums::OPEN_POSITIONING_CASCADING:
if (other != NULL)
{
diff --git a/indra/llui/llfloater.h b/indra/llui/llfloater.h
index f384e64e53..73e9c9e831 100644
--- a/indra/llui/llfloater.h
+++ b/indra/llui/llfloater.h
@@ -66,9 +66,9 @@ namespace LLFloaterEnums
{
OPEN_POSITIONING_NONE,
OPEN_POSITIONING_CASCADING,
+ OPEN_POSITIONING_CASCADE_GROUP,
OPEN_POSITIONING_CENTERED,
OPEN_POSITIONING_SPECIFIED,
-
OPEN_POSITIONING_COUNT
};
}