From f3ddb75b0373f22fe0bb2f46b0a30f018bddc0ee Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Mon, 30 Jan 2012 18:32:35 -0800
Subject:  EXP-1851 WIP Crash when trying to resize the bottom sections  fixed
 layout logic when dealing with invisibile layout_panels

---
 .../skins/default/xui/en/floater_test_layout_stacks.xml    | 14 ++++++++++++--
 indra/newview/skins/default/xui/en/sidepanel_inventory.xml |  2 +-
 2 files changed, 13 insertions(+), 3 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/newview/skins/default/xui/en/floater_test_layout_stacks.xml b/indra/newview/skins/default/xui/en/floater_test_layout_stacks.xml
index f95f21e63a..f4ef63e73e 100644
--- a/indra/newview/skins/default/xui/en/floater_test_layout_stacks.xml
+++ b/indra/newview/skins/default/xui/en/floater_test_layout_stacks.xml
@@ -26,6 +26,16 @@
                   background_visible="true">
       <text follows="top|left|right" halign="center" text_color="white">flex</text>
     </layout_panel>
+    <layout_panel name="flex"
+                  auto_resize="true"
+                  user_resize="true"
+                  bg_alpha_color="blue"
+                  height="11"
+                  min_height="0"
+                  visible="false"
+                  background_visible="true">
+      <text follows="top|left|right" halign="center" text_color="white">flex</text>
+    </layout_panel>
     <layout_panel name="flex"
                   auto_resize="true"
                   user_resize="true"
@@ -51,7 +61,7 @@
                   background_visible="true">
       <text follows="top|left|right" halign="center" text_color="white">flex</text>
     </layout_panel>
-    <layout_panel name="flex"
+    <!--<layout_panel name="flex"
                   auto_resize="true"
                   user_resize="true"
                   visible="false"
@@ -59,7 +69,7 @@
                   height="100"
                   background_visible="true">
       <text follows="top|left|right" halign="center" text_color="white">flex</text>
-    </layout_panel>
+    </layout_panel>-->
     <layout_panel name="fixed"
                   auto_resize="false"
                   user_resize="true"
diff --git a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
index 1e06a60f55..29e27cb146 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
@@ -48,7 +48,7 @@
                       height="300"
                       width="330" />
              </layout_panel>
-			 <layout_panel
+			    <layout_panel
                  width="330"
                  layout="topleft"
                  auto_resize="true"
-- 
cgit v1.2.3