From 93c68c7c12f2a0d19e94bae833554139f78914e9 Mon Sep 17 00:00:00 2001 From: Richard Linden Date: Fri, 18 May 2012 21:03:45 -0700 Subject: MAINT-959 FIX [PUBLIC]Trouble resizing tabbed floaters don't auto position other floater when it is hosted --- indra/llui/llfloater.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) 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() -- cgit v1.2.3 From a254d0e9b0af8e6f37fedafa6147b20d5659784f Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Tue, 22 May 2012 05:37:35 -0400 Subject: Added tag 3.3.2-beta1 for changeset d29a260119f8 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index f0cd9f0736..dfcc0edda9 100644 --- a/.hgtags +++ b/.hgtags @@ -292,3 +292,4 @@ b43cd25be49e3984ff5361cefad020e069131d98 3.3.1-start 5e8d2662f38a66eca6c591295f5880d47afc73f7 viewer-release-candidate c623bbc854b6f7ee1b33a3718f76715046aa2937 viewer-release-candidate c623bbc854b6f7ee1b33a3718f76715046aa2937 3.3.1-release +d29a260119f8d5a5d168e25fed0c7ea6b3f40161 3.3.2-beta1 -- cgit v1.2.3 From dd0094ada48af0a7596eba218ddc5f43197e4823 Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Tue, 22 May 2012 05:39:57 -0400 Subject: Added tag 3.3.2-beta2 for changeset 675668bd24d3 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index dfcc0edda9..28e4438abf 100644 --- a/.hgtags +++ b/.hgtags @@ -293,3 +293,4 @@ b43cd25be49e3984ff5361cefad020e069131d98 3.3.1-start c623bbc854b6f7ee1b33a3718f76715046aa2937 viewer-release-candidate c623bbc854b6f7ee1b33a3718f76715046aa2937 3.3.1-release d29a260119f8d5a5d168e25fed0c7ea6b3f40161 3.3.2-beta1 +675668bd24d3bea570814f71762a2a806f7e1b8d 3.3.2-beta2 -- cgit v1.2.3 From b2b446aed7f7f32151bc152ba25d44253ebf864f Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Thu, 24 May 2012 10:01:24 -0400 Subject: Added tag viewer-release-candidate, 3.3.2-release for changeset 675668bd24d3 --- .hgtags | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.hgtags b/.hgtags index 28e4438abf..4f3f55ad94 100644 --- a/.hgtags +++ b/.hgtags @@ -294,3 +294,6 @@ 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 -- cgit v1.2.3 From a519e34f02b4b2663fe082ba9ad12f1b423669cb Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Mon, 28 May 2012 09:23:24 -0400 Subject: inconsequential change to force new ticket number --- BuildParams | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/BuildParams b/BuildParams index d24666aff9..cff51a286b 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 - # ================================================================= # asset delivery 2010 projects # ================================================================= -- cgit v1.2.3