From afd81a7d742731188f91f4b247abfc69813a95be Mon Sep 17 00:00:00 2001
From: Tofu Linden <tofu.linden@lindenlab.com>
Date: Mon, 23 Nov 2009 16:29:14 +0000
Subject: start to make this a panel instead of a floater.

---
 .../skins/default/xui/en/panel_volume_pulldown.xml | 50 ++++++++++++++++++++++
 1 file changed, 50 insertions(+)
 create mode 100644 indra/newview/skins/default/xui/en/panel_volume_pulldown.xml

(limited to 'indra/newview/skins/default')

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..5d731663cb
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_volume_pulldown.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ background_opaque="false"
+ border_visible="false"
+ background_visible="true"
+ bg_alpha_color="0.3 0.3 0.3 0"
+ bg_opaque_color="0.3 0.3 0.3 0"
+
+ legacy_header_height="0"
+ can_dock="false"
+ can_minimize="false"
+ can_close="false"
+ follows="bottom"
+ height="52"
+ layout="topleft"
+ name="volumepulldown_floater"
+ save_rect="false"
+ save_visibility="false"
+ width="152">
+  <panel
+   border="false"
+   follows="all"
+   height="50"
+   label="xSounds"
+   layout="topleft"
+   left="1"
+   name="xPreference Media panel"
+   top="1"
+   width="150">
+    <slider
+     control_name="AudioLevelMaster"
+     follows="left|top"
+     font.style="BOLD"
+     height="15"
+     increment="0.05"
+     initial_value="0.5"
+     layout="topleft"
+     left="0"
+     name="xSystem Volume"
+     show_text="false"
+     slider_label.halign="right"
+     top_pad="5"
+     volume="true"
+     width="120">
+        <slider.commit_callback
+         function="Pref.setControlFalse"
+         parameter="MuteAudio" />
+    </slider>
+  </panel>
+</floater>
-- 
cgit v1.2.3


From 655f33a9f818d75dd0f8d6040dfffd0520344222 Mon Sep 17 00:00:00 2001
From: Tofu Linden <tofu.linden@lindenlab.com>
Date: Mon, 23 Nov 2009 17:52:37 +0000
Subject: panelized volume pulldown, that doesn't work at all.

---
 .../skins/default/xui/en/panel_volume_pulldown.xml | 24 +++-------------------
 1 file changed, 3 insertions(+), 21 deletions(-)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/panel_volume_pulldown.xml b/indra/newview/skins/default/xui/en/panel_volume_pulldown.xml
index 5d731663cb..289cdbc821 100644
--- a/indra/newview/skins/default/xui/en/panel_volume_pulldown.xml
+++ b/indra/newview/skins/default/xui/en/panel_volume_pulldown.xml
@@ -1,23 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater
- background_opaque="false"
- border_visible="false"
- background_visible="true"
- bg_alpha_color="0.3 0.3 0.3 0"
- bg_opaque_color="0.3 0.3 0.3 0"
-
- legacy_header_height="0"
- can_dock="false"
- can_minimize="false"
- can_close="false"
- follows="bottom"
- height="52"
- layout="topleft"
- name="volumepulldown_floater"
- save_rect="false"
- save_visibility="false"
- width="152">
-  <panel
+<panel
+   chrome="true"
    border="false"
    follows="all"
    height="50"
@@ -46,5 +29,4 @@
          function="Pref.setControlFalse"
          parameter="MuteAudio" />
     </slider>
-  </panel>
-</floater>
+</panel>
-- 
cgit v1.2.3


From f2b3aca83a27386e2fb066afcfe566e89a34fa32 Mon Sep 17 00:00:00 2001
From: Tofu Linden <tofu.linden@lindenlab.com>
Date: Tue, 24 Nov 2009 13:51:26 +0000
Subject: hmm, more panel-ization, but it's not displaying.

---
 indra/newview/skins/default/xui/en/panel_volume_pulldown.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/panel_volume_pulldown.xml b/indra/newview/skins/default/xui/en/panel_volume_pulldown.xml
index 289cdbc821..8c12fd1fb4 100644
--- a/indra/newview/skins/default/xui/en/panel_volume_pulldown.xml
+++ b/indra/newview/skins/default/xui/en/panel_volume_pulldown.xml
@@ -19,14 +19,14 @@
      initial_value="0.5"
      layout="topleft"
      left="0"
-     name="xSystem Volume"
+     name="System Volume"
      show_text="false"
      slider_label.halign="right"
      top_pad="5"
      volume="true"
      width="120">
         <slider.commit_callback
-         function="Pref.setControlFalse"
+         function="Vol.setControlFalse"
          parameter="MuteAudio" />
     </slider>
 </panel>
-- 
cgit v1.2.3


From 7c340079ef679fa4b459cbe2ec0404b3a9a911df Mon Sep 17 00:00:00 2001
From: Tofu Linden <tofu.linden@lindenlab.com>
Date: Wed, 25 Nov 2009 10:22:39 +0000
Subject: more attempts to panelize the volume pulldown, but why won't it show?

---
 indra/newview/skins/default/xui/en/panel_status_bar.xml | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'indra/newview/skins/default')

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 b1afe76500..f1e8f7ebd7 100644
--- a/indra/newview/skins/default/xui/en/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_status_bar.xml
@@ -82,6 +82,17 @@
      name="volume_btn"
      tool_tip="Global Volume Control"
      width="16" />
+    <panel
+     class="panel_volume_pulldown"
+     filename="panel_volume_pulldown.xml"
+     follows="all"
+     height="533"
+     layout="topleft"
+     left="0"
+     name="volume_pulldown"
+     top="5"
+     visible="false"
+     width="313" />
     <text
      enabled="true"
      follows="right|bottom"
-- 
cgit v1.2.3


From cf485a384ba8cd5249ae11949fe3464252f5ba06 Mon Sep 17 00:00:00 2001
From: Tofu Linden <tofu.linden@lindenlab.com>
Date: Fri, 27 Nov 2009 12:58:45 +0000
Subject: more fiddling and tracing.

---
 indra/newview/skins/default/xui/en/panel_status_bar.xml | 1 -
 1 file changed, 1 deletion(-)

(limited to 'indra/newview/skins/default')

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 a296795aed..d3419eec4d 100644
--- a/indra/newview/skins/default/xui/en/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_status_bar.xml
@@ -83,7 +83,6 @@
      width="16" />
     <panel
      class="panel_volume_pulldown"
-     filename="panel_volume_pulldown.xml"
      follows="all"
      height="533"
      layout="topleft"
-- 
cgit v1.2.3


From 6b1cc111f57193fd98821e00f450b02b2bfded65 Mon Sep 17 00:00:00 2001
From: Tofu Linden <tofu.linden@lindenlab.com>
Date: Fri, 27 Nov 2009 16:47:07 +0000
Subject: working but incomplete, I think I'll go back to panel... again.

---
 indra/newview/skins/default/xui/en/panel_status_bar.xml | 10 ----------
 1 file changed, 10 deletions(-)

(limited to 'indra/newview/skins/default')

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 d3419eec4d..65bc48265d 100644
--- a/indra/newview/skins/default/xui/en/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_status_bar.xml
@@ -81,16 +81,6 @@
      name="volume_btn"
      tool_tip="Global Volume Control"
      width="16" />
-    <panel
-     class="panel_volume_pulldown"
-     follows="all"
-     height="533"
-     layout="topleft"
-     left="0"
-     name="volume_pulldown"
-     top="5"
-     visible="false"
-     width="313" />
     <text
      enabled="true"
      follows="right|bottom"
-- 
cgit v1.2.3


From c5719c445ab49f8725ea21bd5bb51d4a0c106212 Mon Sep 17 00:00:00 2001
From: Tofu Linden <tofu.linden@lindenlab.com>
Date: Fri, 27 Nov 2009 17:34:50 +0000
Subject: whee, back to a floater for now.  i'm going to stop worrying about
 the position for a while and work on the functionality.

---
 indra/newview/skins/default/xui/en/panel_status_bar.xml | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'indra/newview/skins/default')

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 65bc48265d..9c66653e3c 100644
--- a/indra/newview/skins/default/xui/en/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_status_bar.xml
@@ -81,6 +81,17 @@
      name="volume_btn"
      tool_tip="Global Volume Control"
      width="16" />
+    <panel
+     class="panel_volume_pulldown"
+     follows="all"
+     height="533"
+     layout="topleft"
+     left="0"
+     name="volume_pulldown"
+     top="5"
+     visible="false"
+     width="313" />
+
     <text
      enabled="true"
      follows="right|bottom"
-- 
cgit v1.2.3


From b9a6776a736e4b5cc440e678d8003eb7f23aed82 Mon Sep 17 00:00:00 2001
From: Tofu Linden <tofu.linden@lindenlab.com>
Date: Mon, 30 Nov 2009 17:14:29 +0000
Subject: remove dead panel version of the master volume pulldown. the floater
 version turned out easier to get on-spec (though not perfect).

---
 .../skins/default/xui/en/panel_volume_pulldown.xml | 32 ----------------------
 1 file changed, 32 deletions(-)
 delete mode 100644 indra/newview/skins/default/xui/en/panel_volume_pulldown.xml

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/panel_volume_pulldown.xml b/indra/newview/skins/default/xui/en/panel_volume_pulldown.xml
deleted file mode 100644
index 8c12fd1fb4..0000000000
--- a/indra/newview/skins/default/xui/en/panel_volume_pulldown.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel
-   chrome="true"
-   border="false"
-   follows="all"
-   height="50"
-   label="xSounds"
-   layout="topleft"
-   left="1"
-   name="xPreference Media panel"
-   top="1"
-   width="150">
-    <slider
-     control_name="AudioLevelMaster"
-     follows="left|top"
-     font.style="BOLD"
-     height="15"
-     increment="0.05"
-     initial_value="0.5"
-     layout="topleft"
-     left="0"
-     name="System Volume"
-     show_text="false"
-     slider_label.halign="right"
-     top_pad="5"
-     volume="true"
-     width="120">
-        <slider.commit_callback
-         function="Vol.setControlFalse"
-         parameter="MuteAudio" />
-    </slider>
-</panel>
-- 
cgit v1.2.3


From 5040a726755939704a3de14187d9d020caea4d9d Mon Sep 17 00:00:00 2001
From: Rick Pasetto <rick@lindenlab.com>
Date: Mon, 30 Nov 2009 16:01:20 -0800
Subject: DEV-43041 DEV-41648 - disable OK and Apply if the media data is the
 same as the initial Review #48

This change kills two birds with one stone: every frame, we check to see if the media data is the same as the one we 'initialize' with. If it is, we disable OK and Cancel. Otherwise we enable them. This makes it very difficult to set empty media data, as well as fixing the "apply button doesn't grey out" bug.
---
 .../xui/en/panel_media_settings_general.xml        | 23 ++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

(limited to 'indra/newview/skins/default')

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 e00f654750..89f1fe35ca 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
@@ -221,12 +221,23 @@
    width="50" />
    
   <text bottom_delta="0" follows="top|left" height="15" left_delta="60" name="X_label">
-    X
+	X
   </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="20" max_val="2048" min_val="0" mouse_opaque="true"
-	     name="height_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="20" 
+	  max_val="2048" 
+	  min_val="0"
+	  mouse_opaque="true"
+	  name="height_pixels"
+	  width="50" />
  
 </panel>
-- 
cgit v1.2.3