diff options
| author | Kitty Barnett <develop@catznip.com> | 2012-05-30 22:09:17 +0200 |
|---|---|---|
| committer | Kitty Barnett <develop@catznip.com> | 2012-05-30 22:09:17 +0200 |
| commit | e4c54afec2445e43b77fc955f6fc97ec3519b064 (patch) | |
| tree | 99f2d7eeba27d215da6b40476e4316a5c8465690 | |
| parent | 1300f77fdd48d90d09a05058ffdf10df93092391 (diff) | |
| parent | a519e34f02b4b2663fe082ba9ad12f1b423669cb (diff) | |
Merged with viewer-release
| -rw-r--r-- | .hgtags | 5 | ||||
| -rw-r--r-- | BuildParams | 13 | ||||
| -rw-r--r-- | indra/llui/llfloater.cpp | 7 |
3 files changed, 10 insertions, 15 deletions
@@ -292,3 +292,8 @@ b43cd25be49e3984ff5361cefad020e069131d98 3.3.1-start 5e8d2662f38a66eca6c591295f5880d47afc73f7 viewer-release-candidate c623bbc854b6f7ee1b33a3718f76715046aa2937 viewer-release-candidate c623bbc854b6f7ee1b33a3718f76715046aa2937 3.3.1-release +d29a260119f8d5a5d168e25fed0c7ea6b3f40161 3.3.2-beta1 +675668bd24d3bea570814f71762a2a806f7e1b8d 3.3.2-beta2 +c623bbc854b6f7ee1b33a3718f76715046aa2937 viewer-release-candidate +675668bd24d3bea570814f71762a2a806f7e1b8d viewer-release-candidate +675668bd24d3bea570814f71762a2a806f7e1b8d 3.3.2-release diff --git a/BuildParams b/BuildParams index e0aad8440b..b423191093 100644 --- a/BuildParams +++ b/BuildParams @@ -138,19 +138,6 @@ oz_viewer-beta-review.viewer_channel = "Second Life Beta Viewer" oz_viewer-beta-review.login_channel = "Second Life Beta Viewer"
oz_viewer-beta-review.email = oz@lindenlab.com
-oz_project-1.build_debug_release_separately = true
-oz_project-1.codeticket_add_context = false
-oz_project-1.email = oz@lindenlab.com
-oz_project-2.build_debug_release_separately = true
-oz_project-2.codeticket_add_context = false
-oz_project-2.email = oz@lindenlab.com
-oz_project-3.build_debug_release_separately = true
-oz_project-3.codeticket_add_context = false
-oz_project-3.email = oz@lindenlab.com
-oz_project-4.build_debug_release_separately = true
-oz_project-4.codeticket_add_context = false
-oz_project-4.email = oz@lindenlab.com
-
oz_project-7.build_debug_release_separately = true
oz_project-7.codeticket_add_context = false
oz_project-7.email = "sldev@catznip.com oz@lindenlab.com"
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() |