From a9b6989fad493ccc2bb8aae0ffe1e11783635261 Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Sun, 1 Aug 2010 03:26:57 -0500
Subject: Revamped the LightShare option in Preferences > Advanced.

Instead of a checkbox, it's now a combo box with "Never",
"Ask me every time", or "Always".
---
 .../xui/en-us/panel_preferences_advanced.xml       | 25 ++++++++++++++++++----
 1 file changed, 21 insertions(+), 4 deletions(-)

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

diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml
index af8cb1e..1b463a2 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml
@@ -26,11 +26,28 @@
        font="SansSerifSmall" height="16" initial_value="false"
        label="Enable shadows (WARNING: unstable and requires Ultra graphics)" left="12" mouse_opaque="true"
        name="shadows_check" radio_style="false" width="217" />
+
+
+  <text bottom_delta="-25" left="16" height="15" width="220"
+        follows="top|left">
+    Allow region Windlight settings (LightShare):
+  </text>
+  <combo_box name="lightshare_combo" control_name="LightShareAllowed"
+             bottom_delta="-2" left="240" height="18" width="120"
+             allow_text_entry="false" follows="left|top">
+    <combo_item type="string" name="never" value="0">
+      Never
+    </combo_item>
+    <combo_item type="string" name="ask" value="1">
+      Ask me every time
+    </combo_item>
+    <combo_item type="string" name="always" value="2">
+      Always
+    </combo_item>
+  </combo_box>
+
+
   <check_box bottom_delta="-25" enabled="true" follows="left|top"
-       font="SansSerifSmall" height="16" initial_value="true"
-       label="Use server-side WindLight settings" left="12" mouse_opaque="true"
-       name="windlight_check" radio_style="false" width="217" />
-  <check_box bottom_delta="-18" enabled="true" follows="left|top"
        font="SansSerifSmall" height="16" initial_value="false"
        label="Use HTTP texture fetching" left="12" mouse_opaque="true"
        name="http_texture_check" radio_style="false" width="217" />
-- 
cgit v1.1