From cd4204b2730350eede126190814621b65308c422 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Mon, 16 Jan 2012 11:03:33 -0800
Subject: EXP-1758 WIP Progress spinner not shown during merketplace synch if
 Merchant Outbox floater was previously minimized rewrote layout_stack
 resizing logic to be symmetrical

---
 indra/newview/skins/default/xui/en/panel_progress.xml | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'indra/newview/skins/default/xui/en/panel_progress.xml')

diff --git a/indra/newview/skins/default/xui/en/panel_progress.xml b/indra/newview/skins/default/xui/en/panel_progress.xml
index 4535c56339..7275e8d89b 100644
--- a/indra/newview/skins/default/xui/en/panel_progress.xml
+++ b/indra/newview/skins/default/xui/en/panel_progress.xml
@@ -20,14 +20,12 @@
          layout="topleft"
          min_width="10"
          name="panel1"
-         user_resize="false"
          width="150" />
         <layout_panel
          height="768"
          layout="topleft"
          min_width="640"
          name="panel2"
-         user_resize="false"
          width="640">
             <layout_stack
              follows="left|right|top|bottom"
@@ -121,7 +119,6 @@
          layout="topleft"
          min_width="10"
          name="panel6"
-         user_resize="false"
          width="150" />
     </layout_stack>
     <button
-- 
cgit v1.2.3


From 23773d792d4387a93db6e66bddcfe2035164d7be Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Tue, 17 Jan 2012 17:36:59 -0800
Subject: EXP-1811 FIX Login progress floater has smaller than expected size
 made minimum size reflect default size for 1024 width window of old layout
 stack no way to match behavior

---
 .../skins/default/xui/en/panel_progress.xml        | 30 +++++++++++-----------
 1 file changed, 15 insertions(+), 15 deletions(-)

(limited to 'indra/newview/skins/default/xui/en/panel_progress.xml')

diff --git a/indra/newview/skins/default/xui/en/panel_progress.xml b/indra/newview/skins/default/xui/en/panel_progress.xml
index 7275e8d89b..860caf2d21 100644
--- a/indra/newview/skins/default/xui/en/panel_progress.xml
+++ b/indra/newview/skins/default/xui/en/panel_progress.xml
@@ -12,43 +12,43 @@
      height="768"
      layout="topleft"
      left="0"
-     name="stack1"
+     name="horizontal_centering"
      orientation="horizontal"
      top="0"
      width="1024">
         <layout_panel
          layout="topleft"
          min_width="10"
-         name="panel1"
+         name="left"
          width="150" />
         <layout_panel
          height="768"
          layout="topleft"
-         min_width="640"
-         name="panel2"
-         width="640">
+         min_width="670"
+         name="center"
+         width="670">
             <layout_stack
              follows="left|right|top|bottom"
              height="768"
              layout="topleft"
              left="0"
              orientation="vertical" 
-             name="stack2"
+             name="vertical_centering"
              top="0"
-             width="640">
+             width="670">
                 <layout_panel
                  height="200"
                  layout="topleft"
                  min_height="10"
                  name="panel3"
-                 width="640" />
+                 width="670" />
                 <layout_panel
                  auto_resize="false"
                  height="250"
                  layout="topleft"
                  min_height="250"
                  name="panel4"
-                 width="640">
+                 width="670">
                     <icon
                      color="LoginProgressBoxCenterColor"
                      follows="left|right|bottom|top"
@@ -57,7 +57,7 @@
                      layout="topleft"
                      left="0"
                      top="0"
-                     width="640" />
+                     width="670" />
                     <text
                      follows="left|right|top"
                      font="SansSerifHuge"
@@ -69,7 +69,7 @@
                      name="title_text"
                      text_color="LoginProgressBoxTextColor"
                      top_delta="50"
-                     width="593" />
+                     right="-47"/>
                     <text
                      follows="left|right|top"
                      font="SansSerif"
@@ -81,7 +81,7 @@
                      name="progress_text"
                      text_color="LoginProgressBoxTextColor"
                      top_pad="5"
-                     width="593"
+                     right="-47"
                      word_wrap="true"/>
                     <progress_bar
                      bottom="115"
@@ -104,7 +104,7 @@
                      name="message_text"
                      text_color="LoginProgressBoxTextColor"
                      top="145"
-                     width="550"
+                     right="-90"
                      word_wrap="true"/>
                 </layout_panel>
                 <layout_panel
@@ -112,13 +112,13 @@
                  layout="topleft"
                  min_width="10"
                  name="panel5"
-                 width="640" />
+                 width="670" />
             </layout_stack>
         </layout_panel>
         <layout_panel
          layout="topleft"
          min_width="10"
-         name="panel6"
+         name="right"
          width="150" />
     </layout_stack>
     <button
-- 
cgit v1.2.3