From a36e8dae40c53e5631cac8efc206d2355a3ff705 Mon Sep 17 00:00:00 2001
From: Paul ProductEngine <pguslisty@productengine.com>
Date: Fri, 19 Aug 2011 19:33:22 +0300
Subject: SH-2309 WIP Priority modifications to mesh uploader UI

- Swapped left and right sides of the floater
---
 .../skins/default/xui/en/floater_model_preview.xml | 312 ++++++++++++---------
 1 file changed, 174 insertions(+), 138 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_model_preview.xml b/indra/newview/skins/default/xui/en/floater_model_preview.xml
index 7c6896becf..8f6058a824 100755
--- a/indra/newview/skins/default/xui/en/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/en/floater_model_preview.xml
@@ -27,135 +27,6 @@
   <string name="tbd">TBD</string>
   
 
-  <text left="15" bottom="25" follows="top|left" height="15" name="name_label">
-    Name:
-  </text>
-  <line_editor bottom_delta="20" follows="top|left|right" height="19" max_length_bytes="64" 
-	     name="description_form" prevalidate_callback="ascii" width="290" />
-
-  <text bottom_delta="20" left="15" follows="left|top" height="15" name="model_category_label" text_color="White">
-    What does this model represent?
-  </text>
-  <combo_box top_pad="1" follows="left|top" height="23"
-	     name="model_category_combo"  width="200">
-    <combo_box.drop_down_button
-      label_color="White"/>
-    <combo_item name="Choose one" label="Choose One..." value="MUT_Unspecified"/>
-    <combo_item name="Avatar shape" label="Avatar shape" value="MUT_AvatarShape"/>
-    <combo_item name="Avatar attachment" label="Avatar attachment" value="MUT_AvatarAttachment"/>
-    <combo_item name="Building Component" label="Building Component" value="MUT_BuildingComponent"/>
-    <combo_item name="Moving object (vehicle, animal)" label="Moving object (vehicle, animal)" value="MUT_MovingObject"/>
-    <combo_item name="Large, non moving etc" label="Large, non moving etc" value="MUT_LargeStationary"/>
-    <combo_item name="Smaller, non-moving etc" label="Smaller, non-moving etc" value="MUT_SmallStationary"/>
-    <combo_item name="Not really any of these" label="Not really any of these" value="MUT_Other"/>
-  </combo_box>
-  
-  <text bottom_delta="20" left="15" follows="left|top" height="15" name="lod_label">
-    Preview:
-  </text>
-  <combo_box bottom_delta="20" follows="left|top" height="18"
-	     name="preview_lod_combo" width="240" tool_tip="LOD to view in preview render">
-    <combo_item name="high">
-      Level of Detail: High
-    </combo_item>
-    <combo_item name="medium">
-      Level of Detail: Medium
-    </combo_item>
-    <combo_item name="low">
-      Level of Detail: Low
-    </combo_item>
-    <combo_item name="lowest">
-      Level of Detail: Lowest
-    </combo_item>
-  </combo_box>
-
-    <menu_button follows="top|left" 
-         image_hover_unselected="Toolbar_Left_Over"
-         image_overlay="OptionsMenu_Off"
-         image_selected="Toolbar_Left_Selected"
-         image_unselected="Toolbar_Left_Off"
-         layout="topleft"
-         left_pad="5"
-         name="options_gear_btn"
-         width="31"
-         height="25"/>
-  <!-- Placeholder panel for 3D preview render -->
-  <panel
-    name="preview_panel"
-    left="15"
-    bevel_style="none"
-    border_style="line"
-    border="true"
-    width="290"
-    height="290"
-    follows="all"/>
-    
-    <text
-     font="SansSerif"
-	 bottom_delta="15"
-     left_delta="0"
-     name="warning_title"
-     text_color="Yellow"
-     visible="false">
-     WARNING:
-    </text>
-    <text
-     text_color="White"
-     height="40"
-	 width="290"
-	 top_delta="15"
-     left_delta="0"
-     name="warning_message"
-     parse_urls="true"
-     wrap="true"
-     visible="false">
-     You will not be able to complete the final upload of this model to the Second Life servers. [[VURL] Find out how] to get enabled for mesh model uploads.</text>
-
-  <text
-	height="26"
-	top_pad="5"
-	left_delta="0"
-	name="weights_text_left"
-	width="80"
-	word_wrap="true" 
-	>
-Download:
-Physics:
-  </text>
-  <text
-	height="26"
-	top_delta="0"
-	left_pad="0"
-	name="weights_left"
-	width="70"
-	word_wrap="true" 
-	>
-[ST]
-[PH]
-  </text>
-  <text
-	height="26"
-	top_delta="0"
-	left_pad="0"
-	name="weights_text_right"
-	width="80"
-	word_wrap="true" 
-	>
-Server:
-Prim equivs:
-  </text>
-  <text
-	height="26"
-	top_delta="0"
-	left_pad="0"
-	name="weights_right"
-	width="70"
-	word_wrap="true" 
-	>
-[SIM]
-[EQ]
-  </text>
-
 <!--
   <text
 	height="65"
@@ -188,10 +59,18 @@ L$ [MODEL]
   </text>
     -->
 
+<panel
+ follows="all"
+ height="515"
+ layout="topleft"
+ left="3"
+ name="left_panel"
+ top="0"
+ width="305">
   <tab_container
-    follows="right|top|bottom"
+    follows="all"
     top="15"
-    left="310"
+    left="0"
     height="470"
     width="300"
     name="import_tab"
@@ -551,14 +430,171 @@ L$ [MODEL]
 	>
 	    Upload fee: L$ [FEE]
   </text>
+  </panel>
+
+<panel
+ follows="all"
+ height="515"
+ layout="topleft"
+ left_pad="1"
+ name="right_panel"
+ top="0"
+ width="310">
+
+  <text left="15" bottom="25" follows="top|left" height="15" name="name_label">
+    Name:
+  </text>
+  <line_editor bottom_delta="20" follows="top|left|right" height="19" max_length_bytes="64"
+	     name="description_form" prevalidate_callback="ascii" width="290" />
+
+  <text bottom_delta="20" left="15" follows="left|top" height="15" name="model_category_label" text_color="White">
+    What does this model represent?
+  </text>
+  <combo_box top_pad="1" follows="left|top" height="23"
+	     name="model_category_combo"  width="200">
+    <combo_box.drop_down_button
+      label_color="White"/>
+    <combo_item name="Choose one" label="Choose One..." value="MUT_Unspecified"/>
+    <combo_item name="Avatar shape" label="Avatar shape" value="MUT_AvatarShape"/>
+    <combo_item name="Avatar attachment" label="Avatar attachment" value="MUT_AvatarAttachment"/>
+    <combo_item name="Building Component" label="Building Component" value="MUT_BuildingComponent"/>
+    <combo_item name="Moving object (vehicle, animal)" label="Moving object (vehicle, animal)" value="MUT_MovingObject"/>
+    <combo_item name="Large, non moving etc" label="Large, non moving etc" value="MUT_LargeStationary"/>
+    <combo_item name="Smaller, non-moving etc" label="Smaller, non-moving etc" value="MUT_SmallStationary"/>
+    <combo_item name="Not really any of these" label="Not really any of these" value="MUT_Other"/>
+  </combo_box>
+  
+  <text bottom_delta="20" left="15" follows="left|top" height="15" name="lod_label">
+    Preview:
+  </text>
+  <combo_box bottom_delta="20" follows="left|top" height="18"
+	     name="preview_lod_combo" width="240" tool_tip="LOD to view in preview render">
+    <combo_item name="high">
+      Level of Detail: High
+    </combo_item>
+    <combo_item name="medium">
+      Level of Detail: Medium
+    </combo_item>
+    <combo_item name="low">
+      Level of Detail: Low
+    </combo_item>
+    <combo_item name="lowest">
+      Level of Detail: Lowest
+    </combo_item>
+  </combo_box>
+
+    <menu_button follows="top|left"
+         image_hover_unselected="Toolbar_Left_Over"
+         image_overlay="OptionsMenu_Off"
+         image_selected="Toolbar_Left_Selected"
+         image_unselected="Toolbar_Left_Off"
+         layout="topleft"
+         left_pad="5"
+         name="options_gear_btn"
+         width="31"
+         height="25"/>
+  <!-- Placeholder panel for 3D preview render -->
+  <!--<panel
+    name="preview_panel"
+    left="15"
+    bevel_style="none"
+    border_style="line"
+    border="true"
+    width="290"
+    height="290"
+    follows="all"/>-->
+
+    <text
+     font="SansSerif"
+	 bottom_delta="305"
+     left="15"
+     name="warning_title"
+     text_color="Yellow"
+     visible="true">
+     WARNING:
+    </text>
+    <text
+     text_color="White"
+     height="40"
+	 width="290"
+	 top_delta="15"
+     left_delta="0"
+     name="warning_message"
+     parse_urls="true"
+     wrap="true"
+     visible="true">
+     You will not be able to complete the final upload of this model to the Second Life servers. [[VURL] Find out how] to get enabled for mesh model uploads.</text>
+
+  <text
+	height="26"
+	top_pad="5"
+	left_delta="0"
+	name="weights_text_left"
+	width="80"
+	word_wrap="true"
+	>
+Download:
+Physics:
+  </text>
+  <text
+	height="26"
+	top_delta="0"
+	left_pad="0"
+	name="weights_left"
+	width="70"
+	word_wrap="true"
+	>
+[ST]
+[PH]
+  </text>
+  <text
+	height="26"
+	top_delta="0"
+	left_pad="0"
+	name="weights_text_right"
+	width="80"
+	word_wrap="true"
+	>
+Server:
+Prim equivs:
+  </text>
+  <text
+	height="26"
+	top_delta="0"
+	left_pad="0"
+	name="weights_right"
+	width="70"
+	word_wrap="true" 
+	>
+[SIM]
+[EQ]
+  </text>
+</panel>
+
+<panel
+ follows="bottom|left|right"
+ height="33"
+ layout="topleft"
+ left="0"
+ name="bottom_buttons_panel"
+ top_pad="1"
+ width="610">   
+  <button top="3" left="10"  follows="bottom|left" height="20" label="Set to defaults" width="100" name="reset_btn" tool_tip="Set to defaults"/>
+  <button top="3" left="310"  follows="bottom|right" height="20" label="Calculate weights &amp; fee" width="150" name="calculate_btn" tool_tip="Calculate weights &amp; fee"/>
+  <button top="3" left_delta="0"  follows="bottom|right" height="20" label="Upload" width="80" name="ok_btn" tool_tip="Upload to simulator" visible="false"/>
+  <button top="3" right="-10" follows="right|bottom" height="20" width="80" label="Cancel" name="cancel_btn"/>
+</panel>
   
-  <button bottom="540" left="10"  follows="bottom|left" height="20" label="Set to defaults"
-	     width="100" name="reset_btn" tool_tip="Set to defaults"/>
-  <button left="310"  follows="bottom|right" height="20" label="Calculate weights &amp; fee"
-	     width="150" name="calculate_btn" tool_tip="Calculate weights &amp; fee" top_delta="0"/>
-  <button bottom="540" left="310"  follows="bottom|right" height="20" label="Upload"
-	     width="80" name="ok_btn" tool_tip="Upload to simulator" visible="false"/>
-  <button right="-10" follows="right|bottom" height="20" width="80" label="Cancel" name="cancel_btn" top_delta="0"/>
+<panel
+ name="preview_panel"
+ left="320"
+ top="131"
+ bevel_style="none"
+ border_style="line"
+ border="true"
+ width="290"
+ height="290"
+ follows="all"/>  
   
   <!--
   <button bottom_delta="0" left="10" width="120" name="auto fill" label="Generate LOD" tool_tip="Automatically generate levels of detail"/>
-- 
cgit v1.2.3