From 285ba513368c6b692ea2eb5d13b85300c76adbea Mon Sep 17 00:00:00 2001
From: leyla_linden <none@none>
Date: Fri, 10 Dec 2010 17:05:38 -0800
Subject: fixed model uploader aspect not updating, text not following resize,
 and file name not filling in

---
 .../skins/default/xui/en/floater_model_preview.xml |  2 +-
 .../skins/default/xui/en/floater_model_wizard.xml  | 29 +++++-----------------
 2 files changed, 7 insertions(+), 24 deletions(-)

(limited to 'indra/newview/skins/default')

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 c17c52bb09..779eeacb43 100644
--- a/indra/newview/skins/default/xui/en/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/en/floater_model_preview.xml
@@ -97,7 +97,7 @@
         [X] x [Y] x [Z] m
       </text>
 
-      <text left="10" top_pad="20" follows="top_left" height="15">
+      <text left="10" top_pad="20" follows="top|left" height="15">
         Include:
       </text>
 
diff --git a/indra/newview/skins/default/xui/en/floater_model_wizard.xml b/indra/newview/skins/default/xui/en/floater_model_wizard.xml
index 3f11f7d4dd..4a4b8075c8 100644
--- a/indra/newview/skins/default/xui/en/floater_model_wizard.xml
+++ b/indra/newview/skins/default/xui/en/floater_model_wizard.xml
@@ -133,7 +133,6 @@
 				Filename:
 			</text>
 			<line_editor
-			 control_name="CacheLocationTopFolder"
 			 border_style="line"
 			 border_thickness="1"
 			 follows="left|top"
@@ -142,7 +141,7 @@
 			 layout="topleft"
 	 left_delta="0"
 			 max_length="4096"
-			 name="cache_location"
+			 name="lod_file"
 			 top_pad="5"
 			 width="220" />
 			<button
@@ -179,7 +178,6 @@
 			  follows="all"
 				   width="150">
 			</panel>
-
 			<text
 			 top_pad="10"
 			 width="130"
@@ -191,28 +189,13 @@
 			</text>
 			<text
 			 top_pad="5"
-			 width="10"
-			 height="15"
-			 left_delta="0"
-		 >
-				X:
-			</text>
-			<text
-			 top_delta="0"
-			 width="10"
+			 width="150"
 			 height="15"
-			 left_pad="25"
-		 >
-				Y:
-			</text>
-			<text
-			 top_delta="0"
-			 width="10"
-			 height="15"
-			 left_pad="25"
-		 >
-				Z:
+			 name="import_dimensions"
+			 left_delta="0">
+				X:  [X] |  Y:  [Y] | Z: [Z]
 			</text>
+			
 			<text
 			 top="100"
 			 width="320"
-- 
cgit v1.2.3