From 894a5006b3e5b4c725060443dab34491b0da3a4d Mon Sep 17 00:00:00 2001
From: callum <none@none>
Date: Mon, 14 Dec 2009 13:20:23 -0800
Subject: Fix for DEV-44045 "Update text, checkbox & layout changes for Build :
 Media Settings : Controls tab"

---
 .../xui/en/panel_media_settings_general.xml        | 30 ---------------
 .../xui/en/panel_media_settings_permissions.xml    | 43 ++++++++++++++++++----
 2 files changed, 36 insertions(+), 37 deletions(-)

(limited to 'indra/newview/skins')

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 24c40b32fb..c8ec515e6d 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
@@ -93,35 +93,6 @@
    <button.commit_callback
 	     function="Media.ResetCurrentUrl"/>
   </button>
-  <text 
-   bottom_delta="-5" 
-   follows="top|left" 
-   height="15"
-   left="10" 
-   name="controls_label">
-    Controls:
-  </text>
-  <combo_box 
-   allow_text_entry="false" 
-   bottom_delta="-20"
-   follows="left|top"
-   height="18" 
-   left="10" 
-   max_chars="20"
-   name="controls" 
-   width="120">
-    <combo_item 
-	 name="Standard" 
-	 value="Standard">
-      Standard
-    </combo_item>
-    <combo_item 
-	 name="Mini" 
-	 value="Mini">
-      Mini
-    </combo_item>
-  </combo_box>
-
   <check_box 
    bottom_delta="-25" 
    enabled="true" 
@@ -135,7 +106,6 @@
    name="auto_loop" 
    radio_style="false" 
    width="150" />
-
   <check_box 
    bottom_delta="-25" 
    visible="false" 
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 85f534c4a3..b5c2371510 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
@@ -4,13 +4,42 @@
  enabled="true" 
  follows="left|top|right|bottom"
  height="500" 
- label="Controls" 
+ label="Customize" 
  left="102" 
  mouse_opaque="true"
  name="Media settings for controls" 
  help_topic = "media_settings_controls"
  width="365">
 
+  <text
+   bottom_delta="-50"
+   follows="top|left"
+   height="15"
+   left="10"
+   name="controls_label">
+    Controls:
+  </text>
+  <combo_box
+   allow_text_entry="false"
+   bottom_delta="0"
+   follows="left|top"
+   height="18"
+   left="100"
+   max_chars="20"
+   name="controls"
+   width="120">
+    <combo_item
+	 name="Standard"
+	 value="Standard">
+      Standard
+    </combo_item>
+    <combo_item
+	 name="Mini"
+	 value="Mini">
+      Mini
+    </combo_item>
+  </combo_box>
+
   <text 
    bottom_delta="-50" 
    follows="top|left" 
@@ -27,7 +56,7 @@
    font="SansSerifSmall"
    height="16" 
    initial_value="false"
-   label="Disable Navigation &amp; Interactivity" 
+   label="Allow Navigation &amp; Interactivity" 
    left="30" 
    mouse_opaque="true"
    name="perms_owner_interact" 
@@ -41,7 +70,7 @@
    font="SansSerifSmall"
    height="16" 
    initial_value="false"
-   label="Hide Control Bar" 
+   label="Show Control Bar" 
    left="30" 
    mouse_opaque="true"
    name="perms_owner_control" 
@@ -74,7 +103,7 @@
    font="SansSerifSmall"
    height="16" 
    initial_value="false"
-   label="Disable Navigation &amp; Interactivity" 
+   label="Allow Navigation &amp; Interactivity" 
    left="30" 
    mouse_opaque="true"
    name="perms_group_interact" 
@@ -88,7 +117,7 @@
    font="SansSerifSmall"
    height="16" 
    initial_value="false"
-   label="Hide Control Bar" 
+   label="Show Control Bar" 
    left="30" 
    mouse_opaque="true"
    name="perms_group_control" 
@@ -111,7 +140,7 @@
    font="SansSerifSmall"
    height="16" 
    initial_value="false"
-   label="Disable Navigation &amp; Interactivity" 
+   label="Allow Navigation &amp; Interactivity" 
    left="30" 
    mouse_opaque="true"
    name="perms_anyone_interact" 
@@ -125,7 +154,7 @@
    font="SansSerifSmall"
    height="16" 
    initial_value="false"
-   label="Hide Control Bar" 
+   label="Show Control Bar" 
    left="30" 
    mouse_opaque="true"
    name="perms_anyone_control" 
-- 
cgit v1.2.3