From f332eaa4a69a4546e0b9b2ba3719e3c038731fd3 Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Thu, 10 Sep 2009 21:43:11 -0700
Subject: Created new toolbar control for windlight presets and options

---
 .../skins/default/xui/en-us/panel_overlaybar.xml   | 17 +++++++++++------
 .../xui/en-us/panel_preferences_graphics1.xml      |  4 ++++
 .../default/xui/en-us/panel_windlight_controls.xml | 14 ++++++++++++++
 .../default/xui/en-us/panel_windlight_remote.xml   | 22 ++++++++++++++++++++++
 .../xui/en-us/panel_windlight_remote_expanded.xml  | 12 ++++++++++++
 5 files changed, 63 insertions(+), 6 deletions(-)
 create mode 100644 linden/indra/newview/skins/default/xui/en-us/panel_windlight_controls.xml
 create mode 100644 linden/indra/newview/skins/default/xui/en-us/panel_windlight_remote.xml
 create mode 100644 linden/indra/newview/skins/default/xui/en-us/panel_windlight_remote_expanded.xml

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

diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_overlaybar.xml b/linden/indra/newview/skins/default/xui/en-us/panel_overlaybar.xml
index e785909..21a7664 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_overlaybar.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_overlaybar.xml
@@ -45,16 +45,21 @@
 				     use_bounding_rect="true" width="395" />
 			</layout_stack>
 		</layout_panel>
-		<layout_panel auto_resize="false" bottom="0" left="0" min_width="220" mouse_opaque="false"
+    <layout_panel auto_resize="false" bottom="0" left="0" min_width="202" mouse_opaque="false"
+     			name="windlight_remote_container" use_bounding_rect="true" user_resize="false"
+     			width="200">
+      <panel background_visible="false" border="false" bottom="0" name="windlight_remote" />
+    </layout_panel>
+    <layout_panel auto_resize="false" bottom="0" left="0" min_width="220" mouse_opaque="false"
 		     name="media_remote_container" use_bounding_rect="true" user_resize="false"
 		     width="220">
-			<panel background_visible="false" border="false" bottom="0" name="media_remote" />
-		</layout_panel>
-		<layout_panel auto_resize="false" bottom="0" left="0" min_width="130" mouse_opaque="false"
+      <panel background_visible="false" border="false" bottom="0" name="media_remote" />
+    </layout_panel>
+    <layout_panel auto_resize="false" bottom="0" left="0" min_width="130" mouse_opaque="false"
 		     name="voice_remote_container" use_bounding_rect="true" user_resize="false"
 		     width="128">
-			<panel background_visible="false" border="false" bottom="0" name="voice_remote" />
-		</layout_panel>
+      <panel background_visible="false" border="false" bottom="0" name="voice_remote" />
+    </layout_panel>
 	</layout_stack>
   <string name="unread_count_string_plural">
     New IMs
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_graphics1.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_graphics1.xml
index 527309e..d5d43b1 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_graphics1.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_graphics1.xml
@@ -8,6 +8,10 @@
 	     height="16" initial_value="false"
 	     label="Run Second Life in a window" left="10" mouse_opaque="true"
 	     name="windowed mode" radio_style="false" width="100" />
+  <check_box bottom_delta="0" enabled="true" follows="left|top"
+	     font="SansSerifSmall" height="16" initial_value="false"
+       label="Show environment control in toolbar" left="248" mouse_opaque="true"
+	     name="toggle_windlight_control" radio_style="false" width="237" />
 	<text_editor type="string" length="1" allow_html="false" bg_readonly_color="0 0 0 0" bottom="-43"
 	     embedded_items="false" enabled="false" follows="left|top"
 	     font="SansSerifSmall" height="20" hide_border="true"
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_windlight_controls.xml b/linden/indra/newview/skins/default/xui/en-us/panel_windlight_controls.xml
new file mode 100644
index 0000000..e282c3c
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_windlight_controls.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel bg_visible="false" border="false" border_visible="false" bottom="1"
+     enabled="true" follows="right|bottom" height="20" left="0"
+     name="windlight_controls" width="200">
+  <button bottom="-21" follows="left|bottom" font="SansSerif" halign="center" height="20"
+	     label="Editor" left="4" name="Environment"
+	     tool_tip="Click here to adjust world environment" width="80" />
+  <flyout_button bottom="-21" follows="left|bottom" height="20" label="Presets" left_delta="82" width="86"
+       list_position="above" mouse_opaque="true" name="Presets" tool_tip="Windlight presets">
+  </flyout_button>
+  <button bottom="-22" follows="left|bottom" font="SansSerif" halign="center" height="22" toggle="true" 
+	     label="" left_delta="88" name="Popup" scale_image="true" control_name="ShowWindlightSettingsPopup" 
+       tool_tip="Click here to adjust world environment" width="22" />
+</panel>
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_windlight_remote.xml b/linden/indra/newview/skins/default/xui/en-us/panel_windlight_remote.xml
new file mode 100644
index 0000000..89ae7ce
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_windlight_remote.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel bg_visible="false" border="false" border_visible="false" bottom="0"
+     enabled="true" follows="right|bottom" height="20" left="0" mouse_opaque="true"
+     name="windlight_remote" use_bounding_rect="true" width="200">
+	<panel bottom="1" filename="panel_bg_tab.xml" name="panel_bg_tab" height="22" left="0" width="200" />
+	<panel bottom="3" filename="panel_windlight_controls.xml" name="panel_windlight_controls" height="20" left="0" width="200" />
+  <string name="sunrise">
+    Sunrise
+  </string>
+  <string name="sunset">
+    Midday
+  </string>
+  <string name="noon">
+    Noon
+  </string>
+  <string name="midnight">
+    Midnight
+  </string>
+  <string name="revert_region">
+    Revert to Region Default
+  </string>
+</panel>
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_windlight_remote_expanded.xml b/linden/indra/newview/skins/default/xui/en-us/panel_windlight_remote_expanded.xml
new file mode 100644
index 0000000..31a3dc2
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_windlight_remote_expanded.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel bg_visible="false" border="false" border_visible="false" bottom="0"
+     follows="right|bottom" height="47" left="0" mouse_opaque="true"
+     name="windlight_remote" use_bounding_rect="true" width="200">
+	<panel bottom="1" filename="panel_bg_tab.xml" name="panel_bg_tab" height="47" left="0" width="200" />
+	<slider bottom="-20" can_edit_text="false" control_name="RenderFarClip"
+	     decimal_digits="0" enabled="true" height="18"
+	     increment="8" initial_val="160" label="Draw Distance:"
+	     label_width="80" left="6" max_val="512" min_val="64" mouse_opaque="true"
+	     name="DrawDistance" show_text="true" width="195" />
+	<panel bottom="13" filename="panel_windlight_controls.xml" left="0" width="200" />
+</panel>
-- 
cgit v1.1