diff options
| author | Richard Linden <none@none> | 2011-10-20 17:33:25 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2011-10-20 17:33:25 -0700 |
| commit | 45b10b07473f011bbb9db687fca6daf1190e3d5d (patch) | |
| tree | 716949365889f5b0e7053ffaa8244f7ebb0cb3a1 /indra | |
| parent | 28f9d147e951965da38dd992a824c686ca364f59 (diff) | |
| parent | 03d0c6d35c7a81fbedeb724f60a63611fd4b464f (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience-fui
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/llui/llfloater.cpp | 3 | ||||
| -rw-r--r-- | indra/llui/llfloater.h | 2 |
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 }; } |