DEV-40215, DEV-40829,DEV-40374 ,DEV-40197, DEV-40749, DEV-3877 -- reviewed by rick

4 files changed, 201 insertions, 57 deletions

diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml
index 053215f8ae..c65206d629 100644
--- a/indra/newview/skins/default/xui/en/floater_tools.xml
+++ b/indra/newview/skins/default/xui/en/floater_tools.xml
@@ -2688,7 +2688,7 @@
              height="18"
              layout="topleft"
              left="20"
-             max_length="63"
+			 read_only="true"
              name="media_info"
              select_on_focus="true"
              top_delta="12"
diff --git a/indra/newview/skins/default/xui/en/panel_media_settings_general.xml b/indra/newview/skins/default/xui/en/panel_media_settings_general.xml
index 1e7ca7aa3f..cb7a473c9a 100644
--- a/indra/newview/skins/default/xui/en/panel_media_settings_general.xml
+++ b/indra/newview/skins/default/xui/en/panel_media_settings_general.xml
@@ -64,7 +64,7 @@
 
   <web_browser 
    border_visible="false" 
-   bottom_delta="-120" 
+   bottom_delta="-133" 
    follows="top|left"
    left="120" 
    name="preview_media" 
@@ -83,7 +83,7 @@
   </text>
 
   <text 
-   bottom_delta="-20" 
+   bottom_delta="-5" 
    follows="top|left" 
    height="15"
    left="10" 
@@ -161,32 +161,85 @@
    radio_style="false" 
    width="150" />
 
-  <check_box bottom_delta="-25" enabled="true" follows="left|top" font="SansSerifSmall"
-	     height="16" initial_value="false"
-	     label="Use Default Alternative Image" left="10" mouse_opaque="true"
-	     name="alt_image_enable" radio_style="false" width="150" />
+  <check_box 
+   bottom_delta="-25" 
+   enabled="true" 
+   follows="left|top" 
+   font="SansSerifSmall"
+   height="16" 
+   initial_value="false"
+   label="Use Default Alternative Image" 
+   left="10" 
+   mouse_opaque="true"
+   name="alt_image_enable" 
+   radio_style="false" 
+   width="150" />
 
-  <check_box bottom_delta="-25" enabled="true" follows="left|top" font="SansSerifSmall"
-	     height="16" initial_value="false"
-	     label="Auto Play Media" left="10" mouse_opaque="true"
-	     name="auto_play" radio_style="false" width="150" />
-  <text bottom_delta="-14" follows="top|left" height="15" left="30" width="340" 
-        enabled="false" name="">
+  <check_box 
+   bottom_delta="-25" 
+   enabled="true" 
+   follows="left|top" 
+   font="SansSerifSmall"
+   height="16" 
+   initial_value="false"
+   label="Auto Play Media" 
+   left="10" 
+   mouse_opaque="true"
+   name="auto_play" 
+   radio_style="false" 
+   width="150" />
+   
+  <text 
+   bottom_delta="-14" 
+   follows="top|left" 
+   height="15" 
+   left="30" 
+   width="340" 
+   enabled="false" 
+   name="meida_setting_note">
     Note: Residents can override this setting
   </text>
 
-  <check_box bottom_delta="-25" enabled="true" follows="left|top" font="SansSerifSmall"
-	     height="16" initial_value="false"
-	     label="Auto Scale Media on Face of Object" left="10" mouse_opaque="true"
-	     name="auto_scale" radio_style="false" width="150" />
-  <text bottom_delta="-20" follows="top|left" height="15" left="30" name="">
+  <check_box 
+   bottom_delta="-25" 
+   enabled="true" 
+   follows="left|top" 
+   font="SansSerifSmall"
+   height="16" 
+   initial_value="false"
+   label="Auto Scale Media on Face of Object" 
+   left="10" 
+   mouse_opaque="true"
+   name="auto_scale" 
+   radio_style="false" 
+   width="150" />
+   
+  <text 
+   bottom_delta="-20" 
+   follows="top|left" 
+   height="15" 
+   left="30" 
+   name="">
     Size:
   </text>
-  <spinner bottom_delta="0"
-	     decimal_digits="0" enabled="true" follows="left|top" height="16"
-	     increment="1" initial_val="256" label="" label_width="0"
-	     left_delta="40" max_val="2000" min_val="0" mouse_opaque="true"
-	     name="width_pixels" width="50" />
+  
+  <spinner 
+   bottom_delta="0"
+   decimal_digits="0" 
+   enabled="true" 
+   follows="left|top" 
+   height="16"
+   increment="1" 
+   initial_val="256" 
+   label="" 
+   label_width="0"
+   left_delta="40" 
+   max_val="2000" 
+   min_val="0" 
+   mouse_opaque="true"
+   name="width_pixels" 
+   width="50" />
+   
   <text bottom_delta="0" follows="top|left" height="15" left_delta="60" name="">
     X
   </text>
diff --git a/indra/newview/skins/default/xui/en/panel_media_settings_permissions.xml b/indra/newview/skins/default/xui/en/panel_media_settings_permissions.xml
index f11364874a..0cc1406d62 100644
--- a/indra/newview/skins/default/xui/en/panel_media_settings_permissions.xml
+++ b/indra/newview/skins/default/xui/en/panel_media_settings_permissions.xml
@@ -1,49 +1,137 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel border="true" enabled="true" follows="left|top|right|bottom"
-    height="500" label="Controls" left="102" mouse_opaque="true"
-    name="Media settings for controls" width="365">
+<panel 
+ border="true" 
+ enabled="true" 
+ follows="left|top|right|bottom"
+ height="500" 
+ label="Controls" 
+ left="102" 
+ mouse_opaque="true"
+ name="Media settings for controls" 
+ width="365">
 
-  <text bottom_delta="-50" follows="top|left" height="15" left="10" name="" enabled="false">
+  <text 
+   bottom_delta="-50" 
+   follows="top|left" 
+   height="15" 
+   left="10" 
+   name="media_perms_label_owner" 
+   enabled="false">
     Owner
   </text>
-  <check_box bottom_delta="-22" enabled="true" follows="left|top" font="SansSerifSmall"
-         height="16" initial_value="false"
-         label="Disable Navigation &amp; Interactivity" left="30" mouse_opaque="true"
-         name="perms_owner_interact" radio_style="false" width="250" />
+  
+  <check_box 
+   bottom_delta="-22" 
+   enabled="true" 
+   follows="left|top" 
+   font="SansSerifSmall"
+   height="16" 
+   initial_value="false"
+   label="Disable Navigation &amp; Interactivity" 
+   left="30" 
+   mouse_opaque="true"
+   name="perms_owner_interact" 
+   radio_style="false" 
+   width="250" />
 
-  <check_box bottom_delta="-22" enabled="true" follows="left|top" font="SansSerifSmall"
-         height="16" initial_value="false"
-         label="Hide Control Bar" left="30" mouse_opaque="true"
-         name="perms_owner_control" radio_style="false" width="250" />
+  <check_box 
+   bottom_delta="-22" 
+   enabled="true" 
+   follows="left|top" 
+   font="SansSerifSmall"
+   height="16" 
+   initial_value="false"
+   label="Hide Control Bar" 
+   left="30" 
+   mouse_opaque="true"
+   name="perms_owner_control" 
+   radio_style="false" 
+   width="250" />
 
-  <text bottom_delta="-36" follows="top|left" height="15" left="10" name="perms_group_name_label" enabled="false">
+  <text 
+   bottom_delta="-36" 
+   follows="top|left" 
+   height="15" 
+   left="10" 
+   name="media_perms_label_group" 
+   enabled="false">
     Group
   </text>
-  <name_box bottom_delta="-5" enabled="false" follows="left|top" font="SansSerif"
-	     height="20" left="60" name="perms_group_name"
-       value ="" 
-	     width="200" />
-  <check_box bottom_delta="-22" enabled="true" follows="left|top" font="SansSerifSmall"
-         height="16" initial_value="false"
-         label="Disable Navigation &amp; Interactivity" left="30" mouse_opaque="true"
-         name="perms_group_interact" radio_style="false" width="250" />
+  
+  <name_box 
+   bottom_delta="-5" 
+   enabled="false" 
+   follows="left|top" 
+   font="SansSerif"
+   height="20" left="60" 
+   name="perms_group_name"
+   value ="" 
+   width="200" />
+   
+  <check_box 
+   bottom_delta="-22" 
+   enabled="true" 
+   follows="left|top" 
+   font="SansSerifSmall"
+   height="16" 
+   initial_value="false"
+   label="Disable Navigation &amp; Interactivity" 
+   left="30" 
+   mouse_opaque="true"
+   name="perms_group_interact" 
+   radio_style="false" 
+   width="250" />
 
-  <check_box bottom_delta="-22" enabled="true" follows="left|top" font="SansSerifSmall"
-         height="16" initial_value="false"
-         label="Hide Control Bar" left="30" mouse_opaque="true"
-         name="perms_group_control" radio_style="false" width="250" />
+  <check_box 
+   bottom_delta="-22" 
+   enabled="true" 
+   follows="left|top" 
+   font="SansSerifSmall"
+   height="16" 
+   initial_value="false"
+   label="Hide Control Bar" 
+   left="30" 
+   mouse_opaque="true"
+   name="perms_group_control" 
+   radio_style="false" 
+   width="250" />
 
-  <text bottom_delta="-36" follows="top|left" height="15" left="10" name="" enabled="false">
+  <text 
+   bottom_delta="-36" 
+   follows="top|left" 
+   height="15" 
+   left="10" 
+   name="media_perms_label_anyone" 
+   enabled="false">
     Anyone
   </text>
-  <check_box bottom_delta="-22" enabled="true" follows="left|top" font="SansSerifSmall"
-         height="16" initial_value="false"
-         label="Disable Navigation &amp; Interactivity" left="30" mouse_opaque="true"
-         name="perms_anyone_interact" radio_style="false" width="250" />
+  
+  <check_box 
+   bottom_delta="-22" 
+   enabled="true" 
+   follows="left|top" 
+   font="SansSerifSmall"
+   height="16" 
+   initial_value="false"
+   label="Disable Navigation &amp; Interactivity" 
+   left="30" 
+   mouse_opaque="true"
+   name="perms_anyone_interact" 
+   radio_style="false" 
+   width="250" />
 
-  <check_box bottom_delta="-22" enabled="true" follows="left|top" font="SansSerifSmall"
-         height="16" initial_value="false"
-         label="Hide Control Bar" left="30" mouse_opaque="true"
-         name="perms_anyone_control" radio_style="false" width="250" />
+  <check_box 
+   bottom_delta="-22" 
+   enabled="true" 
+   follows="left|top" 
+   font="SansSerifSmall"
+   height="16" 
+   initial_value="false"
+   label="Hide Control Bar" 
+   left="30" 
+   mouse_opaque="true"
+   name="perms_anyone_control" 
+   radio_style="false" 
+   width="250" />
 
 </panel>
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index cfe339d9b3..134d430e35 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -2184,6 +2184,9 @@ Expected .wav, .tga, .bmp, .jpg, .jpeg, or .bvh
 	<string name="'">'</string>	
 	<string name="---">---</string>										
 
+	<!-- media -->
+	<string name="Multiple Media">Multiple Media</string>
+	
 	<!-- OSMessageBox messages -->
 	<string name="MBCmdLineError">
 		An error was found parsing the command line.