Initial code for the upload model wizard - loading model is working, not much else

17 files changed, 259 insertions, 0 deletions

diff --git a/indra/newview/skins/default/textures/model_wizard/check_mark.png b/indra/newview/skins/default/textures/model_wizard/check_mark.png
new file mode 100644
index 0000000000..2c05297f4f
--- /dev/null
+++ b/indra/newview/skins/default/textures/model_wizard/check_mark.png
diff --git a/indra/newview/skins/default/textures/model_wizard/left_button_disabled.png b/indra/newview/skins/default/textures/model_wizard/left_button_disabled.png
new file mode 100644
index 0000000000..c7c0eaa96b
--- /dev/null
+++ b/indra/newview/skins/default/textures/model_wizard/left_button_disabled.png
diff --git a/indra/newview/skins/default/textures/model_wizard/left_button_off.png b/indra/newview/skins/default/textures/model_wizard/left_button_off.png
new file mode 100644
index 0000000000..4a73c254fc
--- /dev/null
+++ b/indra/newview/skins/default/textures/model_wizard/left_button_off.png
diff --git a/indra/newview/skins/default/textures/model_wizard/left_button_over.png b/indra/newview/skins/default/textures/model_wizard/left_button_over.png
new file mode 100644
index 0000000000..6fb5c432de
--- /dev/null
+++ b/indra/newview/skins/default/textures/model_wizard/left_button_over.png
diff --git a/indra/newview/skins/default/textures/model_wizard/left_button_press.png b/indra/newview/skins/default/textures/model_wizard/left_button_press.png
new file mode 100644
index 0000000000..fa18517933
--- /dev/null
+++ b/indra/newview/skins/default/textures/model_wizard/left_button_press.png
diff --git a/indra/newview/skins/default/textures/model_wizard/middle_button_disabled.png b/indra/newview/skins/default/textures/model_wizard/middle_button_disabled.png
new file mode 100644
index 0000000000..bed1a701bd
--- /dev/null
+++ b/indra/newview/skins/default/textures/model_wizard/middle_button_disabled.png
diff --git a/indra/newview/skins/default/textures/model_wizard/middle_button_off.png b/indra/newview/skins/default/textures/model_wizard/middle_button_off.png
new file mode 100644
index 0000000000..57ce9af574
--- /dev/null
+++ b/indra/newview/skins/default/textures/model_wizard/middle_button_off.png
diff --git a/indra/newview/skins/default/textures/model_wizard/middle_button_over.png b/indra/newview/skins/default/textures/model_wizard/middle_button_over.png
new file mode 100644
index 0000000000..2c43022f0e
--- /dev/null
+++ b/indra/newview/skins/default/textures/model_wizard/middle_button_over.png
diff --git a/indra/newview/skins/default/textures/model_wizard/middle_button_press.png b/indra/newview/skins/default/textures/model_wizard/middle_button_press.png
new file mode 100644
index 0000000000..6b8c1baca4
--- /dev/null
+++ b/indra/newview/skins/default/textures/model_wizard/middle_button_press.png
diff --git a/indra/newview/skins/default/textures/model_wizard/progress_bar_bg.png b/indra/newview/skins/default/textures/model_wizard/progress_bar_bg.png
new file mode 100644
index 0000000000..d0b213cdc5
--- /dev/null
+++ b/indra/newview/skins/default/textures/model_wizard/progress_bar_bg.png
diff --git a/indra/newview/skins/default/textures/model_wizard/progress_light.png b/indra/newview/skins/default/textures/model_wizard/progress_light.png
new file mode 100644
index 0000000000..019344f812
--- /dev/null
+++ b/indra/newview/skins/default/textures/model_wizard/progress_light.png
diff --git a/indra/newview/skins/default/textures/model_wizard/right_button_disabled.png b/indra/newview/skins/default/textures/model_wizard/right_button_disabled.png
new file mode 100644
index 0000000000..51505e80c5
--- /dev/null
+++ b/indra/newview/skins/default/textures/model_wizard/right_button_disabled.png
diff --git a/indra/newview/skins/default/textures/model_wizard/right_button_off.png b/indra/newview/skins/default/textures/model_wizard/right_button_off.png
new file mode 100644
index 0000000000..9f93efbd93
--- /dev/null
+++ b/indra/newview/skins/default/textures/model_wizard/right_button_off.png
diff --git a/indra/newview/skins/default/textures/model_wizard/right_button_over.png b/indra/newview/skins/default/textures/model_wizard/right_button_over.png
new file mode 100644
index 0000000000..3a4ec1a315
--- /dev/null
+++ b/indra/newview/skins/default/textures/model_wizard/right_button_over.png
diff --git a/indra/newview/skins/default/textures/model_wizard/right_button_press.png b/indra/newview/skins/default/textures/model_wizard/right_button_press.png
new file mode 100644
index 0000000000..1f1b4c2ed5
--- /dev/null
+++ b/indra/newview/skins/default/textures/model_wizard/right_button_press.png
diff --git a/indra/newview/skins/default/xui/en/floater_model_wizard.xml b/indra/newview/skins/default/xui/en/floater_model_wizard.xml
new file mode 100644
index 0000000000..3f11f7d4dd
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_model_wizard.xml
@@ -0,0 +1,247 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ legacy_header_height="18"
+ layout="topleft"
+ name="Model Wizard"
+ help_topic="model_wizard"
+ bg_opaque_image_overlay="0.5 0.5 0.5 1"
+ height="450"
+ save_rect="true"
+ title="UPLOAD MODEL WIZARD" 
+ width="530">
+	<panel
+		   height="600">
+		<button
+	     top="30"
+		 left="410"
+		 height="32"
+		 name="upload" 
+		 enabled="false" 
+		 label="5. Upload" 
+		 border="false" 
+		 image_unselected="model_wizard/middle_button_off.png"
+		 image_selected="model_wizard/middle_button_press.png"
+		image_hover_unselected="model_wizard/middle_button_over.png"
+		image_disabled="model_wizard/middle_button_disabled.png"
+		image_disabled_selected="model_wizard/middle_button_disabled.png"
+		 width="110"/>
+		<button
+	     top="30"
+		 left="310"
+		 height="32"
+		  tab_stop="false"
+		 name="review"
+		 label="4. Review"
+		 enabled="false"
+		 border="false"
+		 image_unselected="model_wizard/middle_button_off.png"
+		 image_selected="model_wizard/middle_button_press.png"
+		image_hover_unselected="model_wizard/middle_button_over.png"
+		image_disabled="model_wizard/middle_button_disabled.png"
+		image_disabled_selected="model_wizard/middle_button_disabled.png"
+		 width="110"/>
+		<button
+	     top="30"
+		 left="210"
+		 height="32"
+		 name="physics"
+		 label="3. Physics"
+		 tab_stop="false"
+		 enabled="false"
+		 border="false"
+		 image_unselected="model_wizard/middle_button_off.png"
+		 image_selected="model_wizard/middle_button_press.png"
+		image_hover_unselected="model_wizard/middle_button_over.png"
+		image_disabled="model_wizard/middle_button_disabled.png"
+		image_disabled_selected="model_wizard/middle_button_disabled.png"
+		 width="110"/>
+		<button
+	     top="30"
+		 left="115"
+		 name="optimize"
+		 label="2. Optimize"
+		  tab_stop="false"
+		 height="32"
+		 border="false"
+		 image_unselected="model_wizard/middle_button_off.png"
+		 image_selected="model_wizard/middle_button_press.png"
+		image_hover_unselected="model_wizard/middle_button_over.png"
+		image_disabled="model_wizard/middle_button_disabled.png"
+		image_disabled_selected="model_wizard/middle_button_disabled.png"
+		 width="110"/>
+		<button
+	     top="30"
+		 left="15"
+		 name="choose_file"
+		 enabled="false"
+		 label="1. Choose File"
+		 height="32"
+		 image_unselected="model_wizard/left_button_off.png"
+		 image_selected="model_wizard/left_button_press.png"
+		image_hover_unselected="model_wizard/left_button_over.png"
+		image_disabled="model_wizard/left_button_disabled.png"
+		image_disabled_selected="model_wizard/left_button_disabled.png"
+		 width="110"/>
+		<panel
+		 top_pad="20"
+		 height="20"
+		 width="500" 
+		 bg_opaque_color="DkGray2"
+		 background_visible="true"
+		 background_opaque="true" 
+		 left="20">
+		<text
+		 width="200"
+		 left="10" 
+		 top="2" 
+		 height="10"
+		 font="SansSerifBig"
+		 layout="topleft"
+		 >
+			  Upload Model
+		</text></panel>
+		<text
+		 top_pad="14"
+		 width="460"
+		 height="20"
+		 font="SansSerifSmall"
+		 layout="topleft"
+		 word_wrap="true"
+		 left_delta="0">
+			This wizard will help you import mesh models to Second Life.  First specify a file containing the model you wish to import.  Second Life supports COLLADA (.dae) files.
+		</text>
+
+		<panel
+			top_delta="40"
+			left="15"
+		 height="240"
+		 width="500"
+		 bg_opaque_color="DkGray2"
+		 background_visible="true"
+		 background_opaque="true">
+
+			<text
+	 type="string"
+	 length="1"
+	 follows="left|top"
+	 top="10" 
+	 height="10"
+	 layout="topleft"
+	 left_delta="10"
+	 name="Cache location"
+	 width="300">
+				Filename:
+			</text>
+			<line_editor
+			 control_name="CacheLocationTopFolder"
+			 border_style="line"
+			 border_thickness="1"
+			 follows="left|top"
+			 font="SansSerifSmall"
+			 height="20"
+			 layout="topleft"
+	 left_delta="0"
+			 max_length="4096"
+			 name="cache_location"
+			 top_pad="5"
+			 width="220" />
+			<button
+			 follows="left|top"
+			 height="23"
+			 label="Browse..."
+			 label_selected="Browse..."
+			 layout="topleft"
+			 left_pad="10"
+			 name="browse"
+			 top_delta="-1"
+			 width="75">
+			</button>
+			<text
+	top_delta="-15"
+	width="200"
+	height="15"
+	font="SansSerifSmall"
+	layout="topleft"
+	left_pad="24">
+				Model Preview:
+			</text>
+
+			<!-- Placeholder panel for 3D preview render -->
+			
+			<panel
+					left_delta="-2"
+				   top_pad="0"
+					name="preview_panel"
+					bevel_style="none"
+				   border_style="line"
+					border="true"
+				   height="150"
+			  follows="all"
+				   width="150">
+			</panel>
+
+			<text
+			 top_pad="10"
+			 width="130"
+			 height="15"
+			 left="340"
+			 word_wrap="true"
+		 >
+				Dimensions (meters):
+			</text>
+			<text
+			 top_pad="5"
+			 width="10"
+			 height="15"
+			 left_delta="0"
+		 >
+				X:
+			</text>
+			<text
+			 top_delta="0"
+			 width="10"
+			 height="15"
+			 left_pad="25"
+		 >
+				Y:
+			</text>
+			<text
+			 top_delta="0"
+			 width="10"
+			 height="15"
+			 left_pad="25"
+		 >
+				Z:
+			</text>
+			<text
+			 top="100"
+			 width="320"
+			 height="40"
+			 left="10"
+			 word_wrap="true"
+		 >
+				Note:
+Advanced users familiar with 3d content creation tools may prefer to use the Advanced Mesh Import window.
+			</text>
+		</panel>
+		<button
+		 top="410"
+		 right="-175" 
+		 width="80"
+		 height="20"
+		 label="&lt;&lt; Back" />
+		<button
+		 top="410"
+		 right="-92"
+		 width="80"
+		 height="20"
+		 label="Next &gt;&gt; " />
+		<button
+		 top="410"
+		 right="-15"
+		 width="70"
+		 height="20"
+		 label="Cancel" />
+	</panel>
+	<spinner visible="false" left="10" height="20" follows="top|left" width="80" top_pad="-50" value="1.0" min_val="0.01" max_val="64.0" name="import_scale"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index ac854e1736..38833d14df 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -972,6 +972,18 @@
             <menu_item_call.on_visible
             function="File.MeshEnabled"/>
             </menu_item_call>
+			<menu_item_call
+           label="Model Wizard..."
+           layout="topleft"
+           name="Upload Model Wizard">
+				<menu_item_call.on_click
+				 function="Floater.Show"
+				 parameter="upload_model_wizard" />
+				<menu_item_call.on_enable
+				 function="File.EnableUploadModel" />
+				<menu_item_call.on_visible
+				function="File.MeshEnabled"/>
+			</menu_item_call>
             <menu_item_call
              label="Bulk (L$[COST] per file)..."
              layout="topleft"