merge

2 files changed, 55 insertions, 1 deletions

diff --git a/indra/newview/skins/default/xui/en/panel_status_bar.xml b/indra/newview/skins/default/xui/en/panel_status_bar.xml
index 00f54feabd..5c9c9b5611 100644
--- a/indra/newview/skins/default/xui/en/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_status_bar.xml
@@ -84,7 +84,6 @@
      tool_tip="Global Volume Control"
      width="16" />
     <text
-     enabled="true"
      follows="right|bottom"
      halign="center"
      height="12"
diff --git a/indra/newview/skins/default/xui/en/panel_volume_pulldown.xml b/indra/newview/skins/default/xui/en/panel_volume_pulldown.xml
new file mode 100644
index 0000000000..60d4a7e00b
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_volume_pulldown.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+ background_opaque="true"
+ background_visible="false"
+ border_visible="false"
+ border="false"
+ chrome="true" 
+ follows="bottom"
+ height="150"
+ layout="topleft"
+ name="volumepulldown_floater"
+ width="32">
+  <!-- floater background image -->
+  <icon
+   height="150"
+   image_name="Inspector_Background"
+   layout="topleft"
+   left="0"
+   name="normal_background"
+   top="0"
+   width="32" />
+ <slider
+  control_name="AudioLevelMaster"
+  follows="left|top"
+  left="0"
+  top="1"
+  orientation="vertical"
+  height="120"
+  increment="0.05"
+  initial_value="0.5"
+  layout="topleft"
+  name="mastervolume"
+  show_text="false"
+  slider_label.halign="right"
+  top_pad="2"
+  volume="true">
+  <slider.commit_callback
+   function="Vol.setControlFalse"
+   parameter="MuteAudio" />
+  </slider>
+  <button
+    left="7"
+    top_pad="9"
+    width="18"
+    height="12"
+    follows="top|left"
+    name="prefs_btn"
+    image_unselected="Icon_Gear_Foreground"
+    image_disabled="Icon_Gear_Background"
+    image_pressed="Icon_Gear_Press"
+    scale_image="false">
+    <button.commit_callback
+       function="Vol.GoAudioPrefs" />
+  </button>
+</panel>