From c6b66690964e45ba1e650f8eb8c70c0ba975534c Mon Sep 17 00:00:00 2001
From: Hazim Gazov <hazim.gazov@gmail.com>
Date: Mon, 3 May 2010 05:09:01 -0300
Subject: [PATCH] Import is now partially working... does not seem to apply
 properties properly, though

---
 indra/newview/app_settings/mime_types.xml     | 445 ++++++++++++++++++
 .../default/xui/en-us/floater_import.xml      |  48 +-
 .../xui/en-us/floater_import_options.xml      |  26 +
 3 files changed, 495 insertions(+), 24 deletions(-)
 create mode 100644 indra/newview/app_settings/mime_types.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en-us/floater_import.xml
 create mode 100755 indra/newview/skins/default/xui/en-us/floater_import_options.xml

diff --git a/indra/newview/app_settings/mime_types.xml b/indra/newview/app_settings/mime_types.xml
new file mode 100644
index 000000000..715ac02b6
--- /dev/null
+++ b/indra/newview/app_settings/mime_types.xml
@@ -0,0 +1,445 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<mimetypes name="default">
+	<defaultlabel>
+		(Unknown)
+	</defaultlabel>
+	<defaultwidget>
+		none
+	</defaultwidget>
+	<defaultimpl>
+		media_plugin_webkit
+	</defaultimpl>
+	<widgetset name="web">
+		<label name="web_label">
+			Web Content
+		</label>
+		<icon>
+			icn_media_web.tga
+		</icon>
+		<default_type>
+			text/html
+		</default_type>
+		<tooltip name="web_tooltip">
+			This location has Web content
+		</tooltip>
+		<playtip name="web_playtip">
+			Show Web content
+		</playtip>
+		<allow_resize>
+			true
+		</allow_resize>
+		<allow_looping>
+			false
+		</allow_looping>
+	</widgetset>
+	<widgetset name="movie">
+		<label name="movie_label">
+			Movie
+		</label>
+		<default_type>
+			video/*
+		</default_type>
+		<icon>
+			icn_media_movie.tga
+		</icon>
+		<tooltip name="movie_tooltip">
+			There is a movie to play here
+		</tooltip>
+		<playtip name="movie_playtip">
+			Play movie
+		</playtip>
+		<allow_resize>
+			false
+		</allow_resize>
+		<allow_looping>
+			true
+		</allow_looping>
+	</widgetset>
+	<widgetset name="image">
+		<label name="image_label">
+			Image
+		</label>
+		<icon>
+			icn_media_web.tga
+		</icon>
+		<default_type>
+			image/*
+		</default_type>
+		<tooltip name="image_tooltip">
+			There is an image at this location
+		</tooltip>
+		<playtip name="image_playtip">
+			View this location&apos;s image
+		</playtip>
+		<allow_resize>
+			false
+		</allow_resize>
+		<allow_looping>
+			false
+		</allow_looping>
+	</widgetset>
+	<widgetset name="audio">
+		<label name="audio_label">
+			Audio
+		</label>
+		<icon>
+			icn_media_web.tga
+		</icon>
+		<default_type>
+			audio/*
+		</default_type>
+		<tooltip name="audio_tooltip">
+			There is audio at this location
+		</tooltip>
+		<playtip name="audio_playtip">
+			Play this location&apos;s audio
+		</playtip>
+		<allow_resize>
+			false
+		</allow_resize>
+		<allow_looping>
+			true
+		</allow_looping>
+	</widgetset>
+	<scheme name="rtsp">
+		<label name="rtsp_label">
+			Real Time Streaming
+		</label>
+		<widgettype>
+			movie
+		</widgettype>
+		<impl>
+			media_plugin_quicktime
+		</impl>
+	</scheme>
+	<mimetype name="blank">
+		<label name="blank_label">
+			- None -
+		</label>
+		<widgettype>
+			none
+		</widgettype>
+		<impl>
+			media_plugin_quicktime
+		</impl>
+	</mimetype>
+	<mimetype name="none/none">
+		<label name="none/none_label">
+			- None -
+		</label>
+		<widgettype>
+			none
+		</widgettype>
+	</mimetype>
+	<mimetype name="audio/*">
+		<label name="audio2_label">
+			Audio
+		</label>
+		<widgettype>
+			audio
+		</widgettype>
+	</mimetype>
+	<mimetype name="video/*">
+		<label name="video2_label">
+			Video
+		</label>
+		<widgettype>
+			movie
+		</widgettype>
+	</mimetype>
+	<mimetype name="image/*">
+		<label name="image2_label">
+			Image
+		</label>
+		<widgettype>
+			image
+		</widgettype>
+	</mimetype>
+	<mimetype menu="1" name="video/vnd.secondlife.qt.legacy">
+		<label name="vnd.secondlife.qt.legacy_label">
+			Movie (QuickTime)
+		</label>
+		<widgettype>
+			movie
+		</widgettype>
+		<impl>
+      media_plugin_quicktime
+    </impl>
+	</mimetype>
+	<mimetype name="application/javascript">
+		<label name="application/javascript_label">
+			Javascript
+		</label>
+		<widgettype>
+			web
+		</widgettype>
+	</mimetype>
+	<mimetype name="application/ogg">
+		<label name="application/ogg_label">
+			Ogg Audio/Video
+		</label>
+		<widgettype>
+			audio
+		</widgettype>
+	</mimetype>
+	<mimetype name="application/pdf">
+		<label name="application/pdf_label">
+			PDF Document
+		</label>
+		<widgettype>
+			image
+		</widgettype>
+	</mimetype>
+	<mimetype name="application/postscript">
+		<label name="application/postscript_label">
+			Postscript Document
+		</label>
+		<widgettype>
+			image
+		</widgettype>
+	</mimetype>
+	<mimetype name="application/rtf">
+		<label name="application/rtf_label">
+			Rich Text (RTF)
+		</label>
+		<widgettype>
+			image
+		</widgettype>
+	</mimetype>
+	<mimetype name="application/smil">
+		<label name="application/smil_label">
+		    Synchronized Multimedia Integration Language (SMIL)
+		</label>
+		<widgettype>
+			movie
+		</widgettype>
+		<impl>
+			media_plugin_quicktime
+		</impl>
+	</mimetype>
+	<mimetype name="application/xhtml+xml">
+		<label name="application/xhtml+xml_label">
+			Web Page (XHTML)
+		</label>
+		<widgettype>
+			web
+		</widgettype>
+	</mimetype>
+	<mimetype name="application/x-director">
+		<label name="application/x-director_label">
+			Macromedia Director
+		</label>
+		<widgettype>
+			image
+		</widgettype>
+	</mimetype>
+	<mimetype name="audio/mid">
+		<label name="audio/mid_label">
+			Audio (MIDI)
+		</label>
+		<widgettype>
+			audio
+		</widgettype>
+		<impl>
+			media_plugin_quicktime
+		</impl>
+	</mimetype>
+	<mimetype name="audio/mpeg">
+		<label name="audio/mpeg_label">
+			Audio (MP3)
+		</label>
+		<widgettype>
+			audio
+		</widgettype>
+		<impl>
+			media_plugin_quicktime
+		</impl>
+	</mimetype>
+	<mimetype name="audio/x-aiff">
+		<label name="audio/x-aiff_label">
+			Audio (AIFF)
+		</label>
+		<widgettype>
+			audio
+		</widgettype>
+		<impl>
+			media_plugin_quicktime
+		</impl>
+	</mimetype>
+	<mimetype name="audio/x-wav">
+		<label name="audio/x-wav_label">
+			Audio (WAV)
+		</label>
+		<widgettype>
+			audio
+		</widgettype>
+		<impl>
+			media_plugin_quicktime
+		</impl>
+	</mimetype>
+	<mimetype menu="1" name="image/bmp">
+		<label name="image/bmp_label">
+			Image (BMP)
+		</label>
+		<widgettype>
+			image
+		</widgettype>
+		<impl>
+			media_plugin_webkit
+		</impl>
+	</mimetype>
+	<mimetype menu="1" name="image/gif">
+		<label name="image/gif_label">
+			Image (GIF)
+		</label>
+		<widgettype>
+			image
+		</widgettype>
+		<impl>
+			media_plugin_webkit
+		</impl>
+	</mimetype>
+	<mimetype menu="1" name="image/jpeg">
+		<label name="image/jpeg_label">
+			Image (JPEG)
+		</label>
+		<widgettype>
+			image
+		</widgettype>
+		<impl>
+			media_plugin_webkit
+		</impl>
+	</mimetype>
+	<mimetype menu="1" name="image/png">
+		<label name="image/png_label">
+			Image (PNG)
+		</label>
+		<widgettype>
+			image
+		</widgettype>
+		<impl>
+			media_plugin_webkit
+		</impl>
+	</mimetype>
+	<mimetype name="image/svg+xml">
+		<label name="image/svg+xml_label">
+			Image (SVG)
+		</label>
+		<widgettype>
+			image
+		</widgettype>
+		<impl>
+			media_plugin_webkit
+		</impl>
+	</mimetype>
+	<mimetype menu="1" name="image/tiff">
+		<label name="image/tiff_label">
+			Image (TIFF)
+		</label>
+		<widgettype>
+			image
+		</widgettype>
+		<impl>
+			media_plugin_webkit
+		</impl>
+	</mimetype>
+	<mimetype menu="1" name="text/html">
+		<label name="text/html_label">
+			Web Page
+		</label>
+		<widgettype>
+			web
+		</widgettype>
+		<impl>
+      media_plugin_webkit
+    </impl>
+	</mimetype>
+	<mimetype menu="1" name="text/plain">
+		<label name="text/plain_label">
+			Text
+		</label>
+		<widgettype>
+			text
+		</widgettype>
+		<impl>
+			media_plugin_webkit
+		</impl>
+	</mimetype>
+	<mimetype name="text/xml">
+		<label name="text/xml_label">
+			XML
+		</label>
+		<widgettype>
+			text
+		</widgettype>
+		<impl>
+			media_plugin_webkit
+		</impl>
+	</mimetype>
+	<mimetype menu="1" name="video/mpeg">
+		<label name="video/mpeg_label">
+			Movie (MPEG)
+		</label>
+		<widgettype>
+			movie
+		</widgettype>
+		<impl>
+      media_plugin_quicktime
+    </impl>
+	</mimetype>
+	<mimetype name="video/mp4">
+		<label name="video/mp4_label">
+			Movie (MP4)
+		</label>
+		<widgettype>
+			movie
+		</widgettype>
+		<impl>
+      media_plugin_quicktime
+    </impl>
+	</mimetype>
+	<mimetype menu="1" name="video/quicktime">
+		<label name="video/quicktime_label">
+			Movie (QuickTime)
+		</label>
+		<widgettype>
+			movie
+		</widgettype>
+		<impl>
+      media_plugin_quicktime
+    </impl>
+	</mimetype>
+	<mimetype name="video/x-ms-asf">
+		<label name="video/x-ms-asf_label">
+			Movie (Windows Media ASF)
+		</label>
+		<widgettype>
+			movie
+		</widgettype>
+		<impl>
+      media_plugin_quicktime
+    </impl>
+	</mimetype>
+	<mimetype name="video/x-ms-wmv">
+		<label name="video/x-ms-wmv_label">
+			Movie (Windows Media WMV)
+		</label>
+		<widgettype>
+			movie
+		</widgettype>
+		<impl>
+      media_plugin_quicktime
+    </impl>
+	</mimetype>
+	<mimetype menu="1" name="video/x-msvideo">
+		<label name="video/x-msvideo_label">
+			Movie (AVI)
+		</label>
+		<widgettype>
+			movie
+		</widgettype>
+		<impl>
+      media_plugin_quicktime
+    </impl>
+	</mimetype>
+</mimetypes>
diff --git a/indra/newview/skins/default/xui/en-us/floater_import.xml b/indra/newview/skins/default/xui/en-us/floater_import.xml
old mode 100644
new mode 100755
index 31fc491db..2e438135c
--- a/indra/newview/skins/default/xui/en-us/floater_import.xml
+++ b/indra/newview/skins/default/xui/en-us/floater_import.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater can_close="true" can_drag_on_left="false" can_minimize="false"
-     can_resize="false" height="440" name="Import" title="" width="680">
-	<text height="15" left="10" name="name_label" top="10">
-		Name:
-	</text>
-	<line_editor height="19" max_length="254" name="name_form" width="280" />
-	<text height="15" name="description_label">
-		Description:
-	</text>
-	<line_editor height="19" max_length="254" name="description_form" width="280" />
-	<text height="15" name="preview_label">
-		Files to upload:
-	</text>
-	<scroll_list draw_border="true" height="280" left="10" multi_select="true"
-	     name="upload_list" top="-30" width="400" />
-	<button bottom="10" height="20" label="Cancel" left="182" name="cancel_btn" width="64" />
-	<button bottom="10" height="20" label="Upload (L$10)" left="31" name="ok_btn"
-	     width="110" />
-	<text bottom="356" height="15" left="420" name="preview_label2">
-		Image Preview:
-	</text>
-	<icon height="256" left="420" name="dummy_preview" width="256" />
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater can_close="true" can_drag_on_left="false" can_minimize="false"
+     can_resize="false" height="440" name="Import" title="" width="680">
+	<text height="15" left="10" name="name_label" top="10">
+		Name:
+	</text>
+	<line_editor height="19" max_length="254" name="name_form" width="280" />
+	<text height="15" name="description_label">
+		Description:
+	</text>
+	<line_editor height="19" max_length="254" name="description_form" width="280" />
+	<text height="15" name="preview_label">
+		Files to upload:
+	</text>
+	<scroll_list draw_border="true" height="280" left="10" multi_select="true"
+	     name="upload_list" top="-30" width="400" />
+	<button bottom="10" height="20" label="Cancel" left="182" name="cancel_btn" width="64" />
+	<button bottom="10" height="20" label="Upload (L$10)" left="31" name="ok_btn"
+	     width="110" />
+	<text bottom="356" height="15" left="420" name="preview_label2">
+		Image Preview:
+	</text>
+	<icon height="256" left="420" name="dummy_preview" width="256" />
+</floater>
diff --git a/indra/newview/skins/default/xui/en-us/floater_import_options.xml b/indra/newview/skins/default/xui/en-us/floater_import_options.xml
new file mode 100755
index 000000000..7d2aa290e
--- /dev/null
+++ b/indra/newview/skins/default/xui/en-us/floater_import_options.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater can_close="true" can_drag_on_left="false" can_minimize="true"
+     can_resize="true" height="400" width="310" min_width="310" min_height="200"  
+     name="floater_import" title="Import Options">
+	<scroll_list bottom="76" can_resize="true" column_padding="0" draw_heading="false"
+	     follows="left|top|bottom|right" left="10" multi_select="true"
+	     name="import_list" right="-10" search_column="2" top="-25">
+		<column name="checked" width="20" />
+		<column name="type" width="20" />
+		<column dynamicwidth="true" label="Name" name="name" />
+	</scroll_list>
+	<text bottom="50" left="10" width="100" height="20">Select/Deselect:</text>
+	<button bottom="52" follows="bottom|left" height="20" label="All"
+		 left="110" name="select_all_btn" width="40" />
+	<button bottom="52" follows="bottom|left" height="20" label="Objects"
+		 left_delta="42" name="select_objects_btn" width="64" />
+	<button bottom="52" follows="bottom|left" height="20" label="Wearables"
+		 left_delta="66"  name="select_wearables_btn" width="80" />
+
+	<check_box bottom="28" left="10" width="250" height="20" name="keep_position_check" label="Use previous region position" initial_value="false"/>
+
+	<button bottom="8" follows="bottom|left" height="20" label="OK"
+		 left="10" width="142" name="ok_btn" />
+	<button bottom="8" follows="bottom|left" height="20" label="Cancel"
+		 left="158" width="142"  name="cancel_btn" />
+</floater>