From ade6bbb06c6a842f39a3fe32decf7c66682df092 Mon Sep 17 00:00:00 2001
From: Steven Bennetts <steve@lindenlab.com>
Date: Sun, 21 Jun 2009 17:16:27 +0000
Subject: merge -r 124105-124625 skinning-13 -> viewer-2.0.0-3

---
 .../skins/default/xui/en/floater_auction.xml       | 11 +++++-
 .../skins/default/xui/en/floater_avatar_picker.xml | 10 ++---
 .../skins/default/xui/en/floater_lagmeter.xml      | 11 +++++-
 .../xui/en/floater_notifications_console.xml       |  5 ++-
 .../skins/default/xui/en/floater_preferences.xml   |  1 +
 .../default/xui/en/floater_settings_debug.xml      | 43 ++++++++++++++++++----
 .../default/xui/en/panel_preferences_graphics1.xml |  8 +++-
 7 files changed, 71 insertions(+), 18 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_auction.xml b/indra/newview/skins/default/xui/en/floater_auction.xml
index 21d060fdda..076332e062 100644
--- a/indra/newview/skins/default/xui/en/floater_auction.xml
+++ b/indra/newview/skins/default/xui/en/floater_auction.xml
@@ -29,6 +29,7 @@
      top_pad="12"
      width="400" />
     <check_box
+     control_name="AuctionShowFence" 
      follows="left|bottom"
      height="16"
      initial_value="true"
@@ -47,7 +48,10 @@
      left_delta="0"
      name="snapshot_btn"
      top_pad="4"
-     width="96" />
+     width="96" >
+      <button.commit_callback
+         function="ClickSnapshot" />
+    </button>
     <button
      follows="left|bottom"
      height="20"
@@ -57,5 +61,8 @@
      left_pad="4"
      name="ok_btn"
      top_delta="0"
-     width="48" />
+     width="48">
+      <button.commit_callback
+          function="ClickOK" />
+    </button>
 </floater>
diff --git a/indra/newview/skins/default/xui/en/floater_avatar_picker.xml b/indra/newview/skins/default/xui/en/floater_avatar_picker.xml
index 0e29046500..0012294160 100644
--- a/indra/newview/skins/default/xui/en/floater_avatar_picker.xml
+++ b/indra/newview/skins/default/xui/en/floater_avatar_picker.xml
@@ -64,17 +64,17 @@
              left_delta="0"
              name="Edit"
              top_pad="4"
-             width="132" />
+             width="50" />
             <button
              follows="top|right"
              height="20"
              label="Find"
              label_selected="Find"
              layout="topleft"
-             left_pad="30"
+             left_pad="5"
              name="Find"
              top_delta="-1"
-             width="95" />
+             width="62" />
             <scroll_list
              follows="left|top|right|bottom"
              height="90"
@@ -196,12 +196,12 @@
      top="324"
      width="95" />
     <button
-     follows="left|bottom"
+     follows="right|bottom"
      height="20"
      label="Cancel"
      label_selected="Cancel"
      layout="topleft"
-     left_pad="70"
+     right="-10" 
      name="Cancel"
      top_delta="0"
      width="95" />
diff --git a/indra/newview/skins/default/xui/en/floater_lagmeter.xml b/indra/newview/skins/default/xui/en/floater_lagmeter.xml
index ebe8df9f5e..8af4f74aa3 100644
--- a/indra/newview/skins/default/xui/en/floater_lagmeter.xml
+++ b/indra/newview/skins/default/xui/en/floater_lagmeter.xml
@@ -201,6 +201,7 @@
         Client:
     </text>
     <text
+	 make_visible_control="LagMeterShrunk"
      type="string"
      length="1"
      bottom="40"
@@ -214,6 +215,7 @@
         Normal
     </text>
     <text
+	 make_visible_control="LagMeterShrunk"	
      bottom="56"
      follows="left|top"
      height="16"
@@ -248,6 +250,7 @@
         Network:
     </text>
     <text
+	 make_visible_control="LagMeterShrunk"
      type="string"
      length="1"
      bottom="80"
@@ -261,6 +264,7 @@
         Normal
     </text>
     <text
+	 make_visible_control="LagMeterShrunk"	
      bottom="96"
      follows="left|top"
      height="16"
@@ -295,6 +299,7 @@
         Server:
     </text>
     <text
+	 make_visible_control="LagMeterShrunk"
      type="string"
      length="1"
      bottom="120"
@@ -308,6 +313,7 @@
         Normal
     </text>
     <text
+	 make_visible_control="LagMeterShrunk"
      bottom="136"
      follows="left|top"
      height="16"
@@ -333,5 +339,8 @@
      left_delta="-317"
      name="minimize"
      top_delta="-2"
-     width="25" />
+     width="25">
+        <button.commit_callback
+         function="LagMeter.ClickShrink" />
+    </button>
 </floater>
diff --git a/indra/newview/skins/default/xui/en/floater_notifications_console.xml b/indra/newview/skins/default/xui/en/floater_notifications_console.xml
index 92ecb5908e..14aa12aed7 100644
--- a/indra/newview/skins/default/xui/en/floater_notifications_console.xml
+++ b/indra/newview/skins/default/xui/en/floater_notifications_console.xml
@@ -24,7 +24,10 @@
      left_pad="3"
      name="add_notification"
      top_delta="0"
-     width="50" />
+     width="50" >
+        <button.commit_callback
+         function="ClickAdd" />
+    </button>
     <layout_stack
      bottom="495"
      follows="left|right|top|bottom"
diff --git a/indra/newview/skins/default/xui/en/floater_preferences.xml b/indra/newview/skins/default/xui/en/floater_preferences.xml
index ba28016d8e..1760d5b818 100644
--- a/indra/newview/skins/default/xui/en/floater_preferences.xml
+++ b/indra/newview/skins/default/xui/en/floater_preferences.xml
@@ -109,6 +109,7 @@
          layout="topleft"
          name="web" />
         <panel
+		 class="panel_preference"
          filename="panel_preferences_graphics1.xml"
          label="Graphics"
          layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/floater_settings_debug.xml b/indra/newview/skins/default/xui/en/floater_settings_debug.xml
index 108d0b97e8..9a73ffb1a2 100644
--- a/indra/newview/skins/default/xui/en/floater_settings_debug.xml
+++ b/indra/newview/skins/default/xui/en/floater_settings_debug.xml
@@ -15,7 +15,10 @@
      max_chars="255"
      name="settings_combo"
      top="30"
-     width="200" />
+     width="200">
+      <combo_box.commit_callback
+       function="SettingSelect" />
+    </combo_box>
     <text_editor
      enabled="false"
      height="60"
@@ -41,6 +44,8 @@
         <combo_box.item
          label="FALSE"
          value="" />
+         <combo_box.commit_callback
+           function="CommitSettings" />
     </combo_box>
     <line_editor
      height="20"
@@ -49,14 +54,21 @@
      name="val_text"
      top_delta="0"
      visible="false"
-     width="300" />
+     width="300" >
+      <line_editor.commit_callback
+       function="CommitSettings" />
+    </line_editor>
     <color_swatch
      bottom="185"
      can_apply_immediately="true"
      height="55"
+     name="val_color_swatch" 
      label="Color"
      layout="topleft"
-     width="37" />
+     width="37" >
+      <color_swatch.commit_callback
+       function="CommitSettings" />
+    </color_swatch>
     <spinner
      height="20"
      label="x"
@@ -66,7 +78,10 @@
      name="val_spinner_1"
      top_delta="10"
      visible="false"
-     width="120" />
+     width="120" >
+      <spinner.commit_callback
+       function="CommitSettings" />
+    </spinner>
     <spinner
      height="20"
      label="x"
@@ -76,7 +91,10 @@
      name="val_spinner_2"
      top_delta="0"
      visible="false"
-     width="120" />
+     width="120">
+      <spinner.commit_callback
+       function="CommitSettings" />
+    </spinner>
     <spinner
      height="20"
      label="x"
@@ -86,7 +104,10 @@
      name="val_spinner_3"
      top="160"
      visible="false"
-     width="120" />
+     width="120">
+      <spinner.commit_callback
+       function="CommitSettings" />
+    </spinner>
     <spinner
      height="20"
      label="x"
@@ -96,7 +117,10 @@
      name="val_spinner_4"
      top_delta="0"
      visible="false"
-     width="120" />
+     width="120" >
+      <spinner.commit_callback
+       function="CommitSettings" />
+    </spinner>
     <button
      height="20"
      label="Reset to default"
@@ -104,5 +128,8 @@
      left="15"
      name="default_btn"
      top="190"
-     width="150" />
+     width="150" >
+      <button.commit_callback
+       function="ClickDefault" />
+    </button>
 </floater>
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
index 929f857e90..8db8c8f31d 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
@@ -165,6 +165,9 @@
          enabled="true"
          label="16:9 (Widescreen)"
          value="1.7777777" />
+		 <combo_box.commit_callback
+         function="setControlFalse"
+		 parameter="FullScreenAutoDetectAspectRatio" />
     </combo_box>
     <check_box
 	 make_invisible_control="NotFullScreen"
@@ -336,7 +339,10 @@
      name="QualityPerformanceSelection"
      show_text="false"
      top_delta="-1"
-     width="150" />
+     width="150">
+	 <slider.commit_callback
+			function="Pref.QualityPerformance"/>
+	</slider>		
     <check_box
      control_name="RenderCustomSettings"
      height="16"
-- 
cgit v1.2.3