From 337f95f8b92d5efd0aaf4e955244ddbeae437bf1 Mon Sep 17 00:00:00 2001
From: "Andrew A. de Laix" <alain@lindenlab.com>
Date: Tue, 7 Dec 2010 16:20:19 -0800
Subject: lamo programmer ui for setting downloader bandwidth limit.

---
 .../default/xui/en/panel_preferences_setup.xml     | 32 ++++++++++++++++++++--
 1 file changed, 29 insertions(+), 3 deletions(-)

(limited to 'indra/newview/skins/default/xui/en/panel_preferences_setup.xml')

diff --git a/indra/newview/skins/default/xui/en/panel_preferences_setup.xml b/indra/newview/skins/default/xui/en/panel_preferences_setup.xml
index 584bd1ea9d..b551901a56 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_setup.xml
@@ -142,7 +142,7 @@
    layout="topleft"
    left="80"
    name="Cache location"
-   top_delta="40"
+   top_delta="20"
    width="300">
     Cache location:
   </text>
@@ -341,7 +341,6 @@
    name="web_proxy_port"
    top_delta="0"
    width="145" />
-
   <check_box
     top_delta="2"
     enabled="true"
@@ -356,5 +355,32 @@
     radio_style="false"
     width="400"
     top_pad="10"/>
-
+  <text
+   type="string"
+   length="1"
+   follows="left|top"
+   height="10"
+   layout="topleft"
+   left_delta="50"
+   name="UpdaterMaximumBandwidthText"
+   mouse_opaque="false"
+   top_pad="10"
+   width="200">
+Download bandwidth  
+  </text>
+  <slider
+   can_edit_text="true"
+   control_name="UpdaterMaximumBandwidth"
+   decimal_digits="0"
+   follows="left|top"
+   height="15"
+   increment="100"
+   initial_value="500"
+   layout="topleft"
+   left_delta="150"
+   max_val="10000"
+   min_val="100"
+   name="updater_max_bandwidth"
+   top_delta="0"
+   width="180" />
 </panel>
-- 
cgit v1.2.3


From 9a3f6c1e0cb690201f91f21e3be393bace827604 Mon Sep 17 00:00:00 2001
From: "Andrew A. de Laix" <alain@lindenlab.com>
Date: Thu, 9 Dec 2010 12:49:51 -0800
Subject: change updater settings from check box to drop down menu; add choice
 of whether to install automatically as well as download automatically (not
 actually implemented yet).

---
 .../default/xui/en/panel_preferences_setup.xml     | 73 ++++++++++------------
 1 file changed, 33 insertions(+), 40 deletions(-)

(limited to 'indra/newview/skins/default/xui/en/panel_preferences_setup.xml')

diff --git a/indra/newview/skins/default/xui/en/panel_preferences_setup.xml b/indra/newview/skins/default/xui/en/panel_preferences_setup.xml
index b551901a56..542b6bcf6b 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_setup.xml
@@ -341,46 +341,39 @@
    name="web_proxy_port"
    top_delta="0"
    width="145" />
-  <check_box
-    top_delta="2"
-    enabled="true"
-    follows="left|top"
-    height="18"
-    initial_value="true"
-    control_name="UpdaterServiceActive"
-    label="Automatically download and install [APP_NAME] updates"
-    left="30"
-    mouse_opaque="true"
-    name="updater_service_active"
-    radio_style="false"
-    width="400"
-    top_pad="10"/>
   <text
-   type="string"
-   length="1"
-   follows="left|top"
-   height="10"
-   layout="topleft"
-   left_delta="50"
-   name="UpdaterMaximumBandwidthText"
-   mouse_opaque="false"
-   top_pad="10"
-   width="200">
-Download bandwidth  
+     type="string"
+     length="1"
+     follows="left|top"
+     height="10"
+     layout="topleft"
+     left="30"
+     name="Software updates:"
+     mouse_opaque="false"
+     top_pad="5"
+     width="300">
+    Software updates:
   </text>
-  <slider
-   can_edit_text="true"
-   control_name="UpdaterMaximumBandwidth"
-   decimal_digits="0"
-   follows="left|top"
-   height="15"
-   increment="100"
-   initial_value="500"
-   layout="topleft"
-   left_delta="150"
-   max_val="10000"
-   min_val="100"
-   name="updater_max_bandwidth"
-   top_delta="0"
-   width="180" />
+  <combo_box
+     control_name="UpdaterServiceSetting"
+     follows="left|top"
+     height="23"
+     layout="topleft"
+     left_delta="50"
+	 top_pad="5"
+     name="updater_service_combobox"
+     width="300">
+        <combo_box.item
+         label="Install automatically"
+         name="Install_automatically"
+         value="3" />
+        <combo_box.item
+         label="Ask before installing"
+         name="Install_ask"
+         value="1" />
+        <combo_box.item
+         label="Download and install updates manually"
+         name="Install_manual"
+         value="0" />
+  </combo_box>
 </panel>
-- 
cgit v1.2.3


From fdd5348f81d51363a1639de8b3cc4414fc0f4982 Mon Sep 17 00:00:00 2001
From: "Andrew A. de Laix" <alain@lindenlab.com>
Date: Mon, 20 Dec 2010 11:34:06 -0800
Subject: Remove unimplemented software updater option.  Fix potential double
 start of updater service.

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

(limited to 'indra/newview/skins/default/xui/en/panel_preferences_setup.xml')

diff --git a/indra/newview/skins/default/xui/en/panel_preferences_setup.xml b/indra/newview/skins/default/xui/en/panel_preferences_setup.xml
index 542b6bcf6b..901a1257e0 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_setup.xml
@@ -367,10 +367,12 @@
          label="Install automatically"
          name="Install_automatically"
          value="3" />
+      <!--
         <combo_box.item
          label="Ask before installing"
          name="Install_ask"
          value="1" />
+      -->
         <combo_box.item
          label="Download and install updates manually"
          name="Install_manual"
-- 
cgit v1.2.3