diff --git a/.hgtags b/.hgtags
index f0cd9f0736155d5d2b07917922d57d7137780715..4f3f55ad943007823162f38df674cdffbd7d914b 100644
--- a/.hgtags
+++ b/.hgtags
@@ -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 e0aad8440bb00de0b0221098c301ad60bde0fcbf..b4231910938f4b1e0aede4fc185c585ca4bbcf7a 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 a8a3a1f906c230c6d19e16a1b4b0c0a8ef411c94..8ca1e685a96922a823d5b182590f53ea90b7cc01 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()