From 93c68c7c12f2a0d19e94bae833554139f78914e9 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
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(-)

(limited to 'indra')

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