From 2efbd052c331bfa2f9de7ace7d8e05eccd30b9a0 Mon Sep 17 00:00:00 2001
From: Kadah_Coba <kadah.coba@gmail.com>
Date: Sun, 13 Nov 2011 01:20:54 -0800
Subject: [PATCH] Pref work: Moved "Media audio rolloff distance" from
 Pref>Advanced to Pref>Media

---
 .../xui/en/panel_preferences_advanced.xml     | 76 +-----------------
 .../xui/en/panel_preferences_sound.xml        | 77 +++++++++++++++++++
 2 files changed, 78 insertions(+), 75 deletions(-)

diff --git a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
index bf1358f5ec..5a4734cd20 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
@@ -57,81 +57,7 @@
      name="show_develop_menu_check"
      top_pad="5"
      width="237"/>
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="10"
-     layout="topleft"
-     left="15"
-     name="Media Rolloff"
-     mouse_opaque="false"
-     top_delta="40"
-     width="155">
-        Media audio rolloff distance:
-    </text>
-    <slider
-     can_edit_text="true"
-     control_name="MediaRollOffMin"
-     decimal_digits="0"
-     label="Min"
-     follows="left|top"
-     height="15"
-     increment="1"
-     initial_value="5"
-     layout="topleft"
-     left="15"
-     max_val="512"
-     min_val="1"
-     name="MediaRollOffMin"
-     top_delta="20"
-     width="200"
-     label_width="25"
-     tool_tip="Minimum distance from the source for rolloff to begin taking effect."/>
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="10"
-     layout="topleft"
-     left_delta="205"
-     name="Meters"
-     mouse_opaque="false"
-     top_delta="2"
-     width="90">
-        meters
-    </text>
-    <slider
-     can_edit_text="true"
-     control_name="MediaRollOffMax"
-     decimal_digits="0"
-     label="Max"
-     follows="left|top"
-     height="15"
-     increment="1"
-     initial_value="30"
-     layout="topleft"
-     left="15"
-     max_val="512"
-     min_val="1"
-     name="MediaRollOffMax"
-     top_delta="15"
-     width="200"
-     label_width="25"
-     tool_tip="Maximum distance from the source for rolloff to completely mute the sound."/>
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="10"
-     layout="topleft"
-     left_delta="205"
-     name="Meters"
-     mouse_opaque="false"
-     top_delta="2"
-     width="90">
-        meters
-    </text>
+
     <button
      top="40"
      enabled="true"
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
index 860a6112ae..c22d676afd 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
@@ -429,8 +429,85 @@
          name="StreamMetadataAnnounceChannel"
          width="90" />
 
+        <text
+         type="string"
+         length="1"
+         follows="left|top"
+         height="10"
+         layout="topleft"
+         left="25"
+         name="Media Rolloff"
+         mouse_opaque="false"
+         top_delta="40"
+         width="155">
+            Media audio rolloff distance:
+        </text>
+        <slider
+         can_edit_text="true"
+         control_name="MediaRollOffMin"
+         decimal_digits="0"
+         label="Min"
+         follows="left|top"
+         height="15"
+         increment="1"
+         initial_value="5"
+         layout="topleft"
+         left="25"
+         max_val="512"
+         min_val="1"
+         name="MediaRollOffMin"
+         top_delta="20"
+         width="200"
+         label_width="25"
+         tool_tip="Minimum distance from the source for rolloff to begin taking effect."/>
+        <text
+         type="string"
+         length="1"
+         follows="left|top"
+         height="10"
+         layout="topleft"
+         left_delta="205"
+         name="Meters"
+         mouse_opaque="false"
+         top_delta="2"
+         width="90">
+            meters
+        </text>
+        <slider
+         can_edit_text="true"
+         control_name="MediaRollOffMax"
+         decimal_digits="0"
+         label="Max"
+         follows="left|top"
+         height="15"
+         increment="1"
+         initial_value="30"
+         layout="topleft"
+         left="25"
+         max_val="512"
+         min_val="1"
+         name="MediaRollOffMax"
+         top_delta="15"
+         width="200"
+         label_width="25"
+         tool_tip="Maximum distance from the source for rolloff to completely mute the sound."/>
+        <text
+         type="string"
+         length="1"
+         follows="left|top"
+         height="10"
+         layout="topleft"
+         left_delta="205"
+         name="Meters"
+         mouse_opaque="false"
+         top_delta="2"
+         width="90">
+            meters
+        </text>
+
     </panel>
 
+         left="25"
     <!-- Voice -->
     <panel
      top_pad="5"