From 74d9bf0d5525426feae4ea21e2a81034ddcf4d7f Mon Sep 17 00:00:00 2001
From: Robin Cornelius <robin.cornelius@gmail.com>
Date: Mon, 28 Mar 2011 11:20:06 +0100
Subject: VWR-20801 Implement SOCKS 5 Proxy for the viewer

---
 .../default/xui/en/floater_preferences_proxy.xml   | 274 +++++++++++++++++++++
 .../newview/skins/default/xui/en/notifications.xml |  70 ++++++
 .../default/xui/en/panel_preferences_setup.xml     |  85 +++----
 3 files changed, 373 insertions(+), 56 deletions(-)
 create mode 100644 indra/newview/skins/default/xui/en/floater_preferences_proxy.xml

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

diff --git a/indra/newview/skins/default/xui/en/floater_preferences_proxy.xml b/indra/newview/skins/default/xui/en/floater_preferences_proxy.xml
new file mode 100644
index 0000000000..bb9ade067b
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_preferences_proxy.xml
@@ -0,0 +1,274 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ legacy_header_height="18"
+ height="490"
+ layout="topleft"
+ name="Socks5 Advanced Settings Floater"
+ help_topic="hardware_settings_floater"
+ title="Socks5 proxy advanced settings"
+ width="385">
+    <check_box
+     control_name="BrowserProxyEnabled"
+     top="30"
+     enabled="true"
+     follows="left|top"
+     height="14"
+     initial_value="false"
+     commit_callback.function="Proxy.Change"
+     label="Use HTTP Proxy for Web pages"
+     left_delta="10"
+     mouse_opaque="true"
+     name="web_proxy_enabled"
+     radio_style="false"
+     width="400"
+     top_pad="5" />
+    <check_box
+     control_name="Socks5ProxyEnabled"
+     height="16"
+     label="Use Socks 5 Proxy for UDP traffic"
+     layout="topleft"
+     left_delta="0"
+     name="socks_proxy_enabled"
+     top_pad="5"
+     width="256"
+     commit_callback.function="Proxy.Change" />
+    <text
+     type="string"
+     length="1"
+     follows="left|top"
+     height="10"
+     layout="topleft"
+     left="10"
+     name="Proxy location"
+     top_delta="30"
+     width="300">
+        Other Http traffic proxy:
+     </text>
+     <radio_group
+      control_name="Socks5HttpProxyType"
+      height="60"
+      layout="topleft"
+      name="other_http_proxy_selection"
+      top_pad="10"
+      width="120"
+      border="1"
+      left_delta="10" 
+      commit_callback.function="Proxy.Change" >
+          <radio_item
+           height="16"
+           label="Do not proxy"
+           layout="topleft"
+           value="None"
+           width="120"
+           tool_tip="Non web Http trafic should NOT be sent to any proxy."/>
+          <radio_item
+           height="16"
+           label="Use Socks 5 Proxy"
+           layout="topleft"
+           value="Socks"
+           width="120"
+           enabled_control="Socks5ProxyEnabled"
+           tool_tip="Non-web Http will be sent to the configured Socks 5 proxy."/>
+          <radio_item
+           height="16"
+           label="Use Http Proxy"
+           layout="topleft"
+           value="Web"
+           width="120"
+           enabled_control="BrowserProxyEnabled"
+           tool_tip="Non-web Http will be sent to the configured Web proxy." />
+    </radio_group>
+    <text
+	 type="string"
+	 length="1"
+	 follows="left|top"
+	 height="10"
+	 left="15"
+	 layout="topleft"
+	 name="Proxy location"
+	 top_delta="82"
+	 width="300">
+	    HTTP Proxy:
+	</text>
+	<line_editor
+	 control_name="BrowserProxyAddress"
+	 enabled_control="BrowserProxyEnabled"
+     follows="left|top"
+	 font="SansSerif"
+	 height="23"
+	 layout="topleft"
+	 left_delta="0"
+	 name="web_proxy_editor"
+	 tool_tip="The DNS name or IP address of the HTTP proxy you would like to use."
+	 top_pad="4"
+	 width="200" />
+	<spinner
+	 control_name="BrowserProxyPort"
+	 enabled_control="BrowserProxyEnabled"
+     decimal_digits="0"
+	 follows="left|top"
+	 height="23"
+	 increment="1"
+	 initial_value="80"
+	 label="Port number:"
+	 label_width="95"
+	 layout="topleft"
+	 left_delta="210"
+	 max_val="12000"
+	 min_val="10"
+	 name="web_proxy_port"
+	 top_delta="0"
+      tool_tip="The port of the HTTP proxy you would like to use."
+	 width="145" />
+	<text
+	 type="string"
+	 length="1"
+	 follows="left|top"
+	 height="10"
+	 layout="topleft"
+	 left="15"
+	 name="Proxy location"
+	 top_delta="32"
+	 width="300">
+	    SOCKS 5 Proxy:
+	</text>
+	<line_editor
+	 control_name="Socks5ProxyHost"
+	 enabled_control="Socks5ProxyEnabled"
+	 follows="left|top"
+	 font="SansSerif"
+	 height="23"
+	 layout="topleft"
+	 left_delta="0"
+	 name="socks_proxy_editor"
+	 tool_tip="The DNS name or IP address of the SOCKS 5 proxy you would like to use."
+	 top_pad="4"
+	 width="200"
+	 commit_callback.function="Proxy.Change" />
+	<spinner
+	 control_name="Socks5ProxyPort"
+	 enabled_control="Socks5ProxyEnabled"
+	 decimal_digits="0"
+	 follows="left|top"
+	 height="23"
+	 increment="1"
+	 initial_value="80"
+	 label="Port number:"
+	 label_width="95"
+	 layout="topleft"
+	 left_delta="210"
+	 max_val="12000"
+	 min_val="10"
+	 name="socks_proxy_port"
+	 top_delta="0"
+	 width="145"
+     tool_tip="The port of the SOCKS 5 proxy you would like to use."
+	 commit_callback.function="Pref.SocksProxy" />
+	<text
+     type="string"
+     length="1"
+     follows="left|top"
+     height="10"
+     layout="topleft"
+     left="16"
+     name="Proxy location"
+     top_delta="35"
+     width="300">
+	    Authentication:
+	</text>
+	<radio_group
+	 control_name="Socks5AuthType"
+	 enabled_control="Socks5ProxyEnabled"
+	 height="50"
+	 layout="topleft"
+	 name="socks5_auth_type"
+	 top_pad="10"
+	 width="120"
+	 border="1"
+	 commit_callback.function="Proxy.Change" >
+	    <radio_item
+		 height="16"
+		 label="No Authentication"
+		 layout="topleft"
+		 name="Socks5NoAuth"
+		 value="None"
+		 tool_tip="Socks5 proxy requires no authentication."/>
+		 width="120" />
+		<radio_item
+		 height="16"
+		 label="Username/Password"
+		 layout="topleft"
+		 name="Socks5UserPass"
+		 value="UserPass"
+		 tool_tip="Socks5 proxy requires username/password authentication."/>
+		 width="120" />
+	</radio_group>
+	<text
+	 type="string"
+	 length="1"
+	 follows="left|top"
+	 height="10"
+	 layout="topleft"
+	 left_delta="20"
+	 top_delta="50"
+	 width="300">
+	    Username:
+	</text>
+	<line_editor
+	 control_name="Socks5Username"
+	 follows="left|top"
+	 font="SansSerif"
+	 height="23"
+	 layout="topleft"
+	 left_delta="0"
+	 name="socks5_username"
+	 tool_tip="The username used to authenticate with your SOCKS 5 server"
+	 top_pad="4"
+	 width="200"
+	 commit_callback.function="Proxy.Change" />
+	<text
+	 type="string"
+	 length="1"
+	 follows="left|top"
+	 height="10"
+	 layout="topleft"
+	 left_delta="0"
+	 top_delta="30"
+	 width="300">
+	    Password:
+	</text>
+	<line_editor
+	 control_name="Socks5Password"
+	 follows="left|top"
+	 font="SansSerif"
+	 height="23"
+	 layout="topleft"
+	 left_delta="0"
+	 name="socks5_password"
+	 tool_tip="The password used to authenticate with your SOCKS 5 server"
+	 top_pad="4"
+	 width="200"
+	 commit_callback.function="Proxy.Change" />
+	<button
+	 follows="left|top"
+	 height="22"
+	 label="OK"
+	 label_selected="OK"
+	 layout="topleft"
+	 right="275"
+	 name="OK"
+	 top_delta="53"
+	 width="90"
+	 commit_callback.function="Proxy.OK" />
+	<button
+	 follows="left|top"
+	 height="22"
+	 label="Cancel"
+	 label_selected="Cancel"
+	 layout="topleft"
+	 right="375"
+	 name="Cancel"
+	 top_delta="0"
+	 width="90"
+	 commit_callback.function="Proxy.Cancel" />
+</floater>
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index ba13479860..751b038252 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -7069,6 +7069,76 @@ Mute everyone?
     </form>
   </notification>
 
+  <notification
+   icon="alertmodal.tga"
+   name="SOCKS_NOT_PERMITTED"
+   type="alertmodal">
+	The Socks5 proxy "[HOST]:[PORT]" refused the connection, not allowed by rule set
+   <usetemplate
+     name="okbutton"
+     yestext="OK"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="SOCKS_CONNECT_ERROR"
+   type="alertmodal">
+	The Socks5 proxy "[HOST]:[PORT]" refused the connection, could not open TCP channel
+   <usetemplate
+     name="okbutton"
+     yestext="OK"/>	 
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="SOCKS_NOT_ACCEPTABLE"
+   type="alertmodal">
+	The Socks5 proxy "[HOST]:[PORT]" refused the selected authentication system
+   <usetemplate
+     name="okbutton"
+     yestext="OK"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="SOCKS_AUTH_FAIL"
+   type="alertmodal">
+	The Socks5 proxy "[HOST]:[PORT]" reported your credentials are invalid
+   <usetemplate
+     name="okbutton"
+     yestext="OK"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="SOCKS_UDP_FWD_NOT_GRANTED"
+   type="alertmodal">
+	The Socks5 proxy "[HOST]:[PORT]" refused the UDP associate request
+   <usetemplate
+     name="okbutton"
+     yestext="OK"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="SOCKS_HOST_CONNECT_FAILED"
+   type="alertmodal">
+	Could not connect to Socks5 proxy server "[HOST]:[PORT]"
+   <usetemplate
+     name="okbutton"
+     yestext="OK"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="ChangeSocks5Settings"
+   type="alert">
+	Socks 5 proxy settings take effect after you restart [APP_NAME].
+   <usetemplate
+     name="okbutton"
+     yestext="OK"/>
+  </notification>
+
   <notification
   name="AuthRequest"
   type="browser">
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 901a1257e0..1a631293e7 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_setup.xml
@@ -70,7 +70,7 @@
    layout="topleft"
    left="77"
    name="connection_port_enabled"
-   top_pad="20"
+   top_pad="10"
    width="256">
     <check_box.commit_callback
      function="Notification.Show"
@@ -102,7 +102,7 @@
    left="80"
    mouse_opaque="false"
    name="cache_size_label_l"
-   top_pad="20"
+   top_pad="10"
    width="200">
     Cache size
   </text>
@@ -287,60 +287,6 @@
     name="media_popup_enabled"
     width="400"           
     top_pad="5"/>
-  <check_box
-    top_delta="4"
-    enabled="true"
-    follows="left|top"
-    height="14"
-    initial_value="false"
-    control_name="BrowserProxyEnabled"
-    label="Enable Web Proxy"
-    left_delta="0"
-    mouse_opaque="true"
-    name="web_proxy_enabled"
-    radio_style="false"
-    width="400"           top_pad="5"/>
-  <text
-   type="string"
-   length="1"
-   follows="left|top"
-   height="10"
-   layout="topleft"
-   left_delta="20"
-   name="Proxy location"
-   top_delta="16"
-   width="300">
-    Proxy location:
-  </text>
-  <line_editor
-   control_name="BrowserProxyAddress"
-   enabled_control="BrowserProxyEnabled"
- follows="left|top"
-   font="SansSerif"
-   height="23"
-   layout="topleft"
-   left_delta="0"
-   name="web_proxy_editor"
-   tool_tip="The name or IP address of the proxy you would like to use"
-   top_pad="4"
-   width="200" />
-  <spinner
-   control_name="BrowserProxyPort"
-   enabled_control="BrowserProxyEnabled"
- decimal_digits="0"
-   follows="left|top"
-   height="23"
-   increment="1"
-   initial_value="80"
-   label="Port number:"
-   label_width="95"
-   layout="topleft"
-   left_delta="210"
-   max_val="12000"
-   min_val="10"
-   name="web_proxy_port"
-   top_delta="0"
-   width="145" />
   <text
      type="string"
      length="1"
@@ -378,4 +324,31 @@
          name="Install_manual"
          value="0" />
   </combo_box>
+  <text
+     type="string"
+     length="1"
+     follows="left|top"
+     height="10"
+     layout="topleft"
+     left="30"
+     name="Software updates:"
+     mouse_opaque="false"
+     top_pad="5"
+     width="300">
+		Proxy Settings:
+  </text>
+  <button
+	label="Adjust proxy settings"
+    follows="left|top"
+    height="23"
+	width="140" 
+    label_selected="Browse"
+    layout="topleft"
+    left_delta="50"
+    name="set_proxy"
+    top_pad="5"
+    >
+		<button.commit_callback
+		  function="Pref.Proxy" />
+  </button>
 </panel>
-- 
cgit v1.2.3


From 6ce2c20a06e32825f4e4260575059a9867510ecd Mon Sep 17 00:00:00 2001
From: Logan Dethrow <log@lindenlab.com>
Date: Fri, 10 Jun 2011 17:34:00 -0400
Subject: STORM-1112 First pass at cleanup of SOCKS 5 proxy code based on
 Linden Coding Standard and comments in the code review.

---
 indra/newview/skins/default/xui/en/floater_preferences_proxy.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_preferences_proxy.xml b/indra/newview/skins/default/xui/en/floater_preferences_proxy.xml
index bb9ade067b..9baa9a0e02 100644
--- a/indra/newview/skins/default/xui/en/floater_preferences_proxy.xml
+++ b/indra/newview/skins/default/xui/en/floater_preferences_proxy.xml
@@ -60,7 +60,7 @@
            layout="topleft"
            value="None"
            width="120"
-           tool_tip="Non web Http trafic should NOT be sent to any proxy."/>
+           tool_tip="Non web Http traffic should NOT be sent to any proxy."/>
           <radio_item
            height="16"
            label="Use Socks 5 Proxy"
-- 
cgit v1.2.3


From cce5dd64e09eb2f0da039c3e6c4c1ebd7b5aafeb Mon Sep 17 00:00:00 2001
From: Jonathan Yap <none@none>
Date: Sun, 26 Jun 2011 04:59:02 -0400
Subject: STORM-1276 [MULTIPLE LANGS] Text truncation in Email Snapshot floater
 in Spanish localization

---
 indra/newview/skins/default/xui/en/floater_postcard.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_postcard.xml b/indra/newview/skins/default/xui/en/floater_postcard.xml
index 8da35e9d7f..c756661ffc 100644
--- a/indra/newview/skins/default/xui/en/floater_postcard.xml
+++ b/indra/newview/skins/default/xui/en/floater_postcard.xml
@@ -7,11 +7,11 @@
  height="380"
  layout="topleft"
  min_height="380"
- min_width="450"
+ min_width="490"
  name="Postcard"
  help_topic="postcard"
  title="EMAIL SNAPSHOT"
- width="450">
+ width="490">
     <floater.string
      name="default_subject">
         Postcard from [SECOND_LIFE].
@@ -40,7 +40,7 @@
      follows="left|top"
      height="20"
      layout="topleft"
-     left_delta="108"
+     left_delta="148"
      name="to_form"
      top_delta="-4"
      width="150" />
@@ -59,7 +59,7 @@
      follows="left|top"
      height="20"
      layout="topleft"
-     left_delta="108"
+     left_delta="148"
      name="from_form"
      top_delta="-4"
      width="150" />
@@ -78,7 +78,7 @@
      follows="left|top"
      height="20"
      layout="topleft"
-     left_delta="108"
+     left_delta="148"
      max_length_bytes="100"
      name="name_form"
      top_delta="-4"
@@ -99,7 +99,7 @@
      height="20"
      label="Type your subject here."
      layout="topleft"
-     left_delta="108"
+     left_delta="148"
      max_length_bytes="100"
      name="subject_form"
      top_delta="-4"
-- 
cgit v1.2.3


From 7717b6f647feb250c0b94d038f72a640a7888915 Mon Sep 17 00:00:00 2001
From: Logan Dethrow <log@lindenlab.com>
Date: Tue, 28 Jun 2011 19:54:53 -0400
Subject: STORM-1112 More cleanup of SOCKS 5 proxy code.

Renamed llsocks5.cpp to llproxy.cpp.
---
 .../default/xui/en/floater_preferences_proxy.xml   | 181 ++++++++++-----------
 .../newview/skins/default/xui/en/notifications.xml |  21 ++-
 .../skins/default/xui/en/panel_cof_wearables.xml   |   2 +-
 .../default/xui/en/panel_preferences_privacy.xml   |   2 +-
 .../default/xui/en/panel_preferences_setup.xml     |   2 +-
 5 files changed, 107 insertions(+), 101 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_preferences_proxy.xml b/indra/newview/skins/default/xui/en/floater_preferences_proxy.xml
index 9baa9a0e02..53060b0326 100644
--- a/indra/newview/skins/default/xui/en/floater_preferences_proxy.xml
+++ b/indra/newview/skins/default/xui/en/floater_preferences_proxy.xml
@@ -3,82 +3,82 @@
  legacy_header_height="18"
  height="490"
  layout="topleft"
- name="Socks5 Advanced Settings Floater"
+ name="Proxy Settings Floater"
  help_topic="hardware_settings_floater"
  title="Socks5 proxy advanced settings"
  width="385">
-    <check_box
-     control_name="BrowserProxyEnabled"
-     top="30"
-     enabled="true"
-     follows="left|top"
-     height="14"
-     initial_value="false"
-     commit_callback.function="Proxy.Change"
-     label="Use HTTP Proxy for Web pages"
-     left_delta="10"
-     mouse_opaque="true"
-     name="web_proxy_enabled"
-     radio_style="false"
-     width="400"
-     top_pad="5" />
-    <check_box
-     control_name="Socks5ProxyEnabled"
-     height="16"
-     label="Use Socks 5 Proxy for UDP traffic"
-     layout="topleft"
-     left_delta="0"
-     name="socks_proxy_enabled"
-     top_pad="5"
-     width="256"
-     commit_callback.function="Proxy.Change" />
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="10"
-     layout="topleft"
-     left="10"
-     name="Proxy location"
-     top_delta="30"
-     width="300">
-        Other Http traffic proxy:
-     </text>
-     <radio_group
-      control_name="Socks5HttpProxyType"
-      height="60"
-      layout="topleft"
-      name="other_http_proxy_selection"
-      top_pad="10"
-      width="120"
-      border="1"
-      left_delta="10" 
-      commit_callback.function="Proxy.Change" >
-          <radio_item
-           height="16"
-           label="Do not proxy"
-           layout="topleft"
-           value="None"
-           width="120"
-           tool_tip="Non web Http traffic should NOT be sent to any proxy."/>
-          <radio_item
-           height="16"
-           label="Use Socks 5 Proxy"
-           layout="topleft"
-           value="Socks"
-           width="120"
-           enabled_control="Socks5ProxyEnabled"
-           tool_tip="Non-web Http will be sent to the configured Socks 5 proxy."/>
-          <radio_item
-           height="16"
-           label="Use Http Proxy"
-           layout="topleft"
-           value="Web"
-           width="120"
-           enabled_control="BrowserProxyEnabled"
-           tool_tip="Non-web Http will be sent to the configured Web proxy." />
-    </radio_group>
-    <text
+	<check_box
+	 control_name="BrowserProxyEnabled"
+	 top="30"
+	 enabled="true"
+	 follows="left|top"
+	 height="14"
+	 initial_value="false"
+	 commit_callback.function="Proxy.Change"
+	 label="Use HTTP Proxy for Web pages"
+	 left_delta="10"
+	 mouse_opaque="true"
+	 name="web_proxy_enabled"
+	 radio_style="false"
+	 width="400"
+	 top_pad="5" />
+	<check_box
+	 control_name="Socks5ProxyEnabled"
+	 height="16"
+	 label="Use Socks 5 Proxy for UDP traffic"
+	 layout="topleft"
+	 left_delta="0"
+	 name="socks_proxy_enabled"
+	 top_pad="5"
+	 width="256"
+	 commit_callback.function="Proxy.Change" />
+	<text
+	type="string"
+	length="1"
+	follows="left|top"
+	height="10"
+	layout="topleft"
+	left="10"
+	name="Proxy location"
+	top_delta="30"
+	width="300">
+	   Other Http traffic proxy:
+	</text>
+	<radio_group
+	 control_name="Socks5HttpProxyType"
+	 height="60"
+	 layout="topleft"
+	 name="other_http_proxy_selection"
+	 top_pad="10"
+	 width="120"
+	 border="1"
+	 left_delta="10" 
+	 commit_callback.function="Proxy.Change" >
+		<radio_item
+		 height="16"
+		 label="Do not proxy"
+		 layout="topleft"
+		 value="None"
+		 width="120"
+		 tool_tip="Non web Http traffic should NOT be sent to any proxy."/>
+		<radio_item
+		 height="16"
+		 label="Use Socks 5 Proxy"
+		 layout="topleft"
+		 value="Socks"
+		 width="120"
+		 enabled_control="Socks5ProxyEnabled"
+		 tool_tip="Non-web Http will be sent to the configured Socks 5 proxy."/>
+		<radio_item
+		 height="16"
+		 label="Use Http Proxy"
+		 layout="topleft"
+		 value="Web"
+		 width="120"
+		 enabled_control="BrowserProxyEnabled"
+		 tool_tip="Non-web Http will be sent to the configured Web proxy." />
+	</radio_group>
+	<text
 	 type="string"
 	 length="1"
 	 follows="left|top"
@@ -93,7 +93,7 @@
 	<line_editor
 	 control_name="BrowserProxyAddress"
 	 enabled_control="BrowserProxyEnabled"
-     follows="left|top"
+	 follows="left|top"
 	 font="SansSerif"
 	 height="23"
 	 layout="topleft"
@@ -118,7 +118,7 @@
 	 min_val="10"
 	 name="web_proxy_port"
 	 top_delta="0"
-      tool_tip="The port of the HTTP proxy you would like to use."
+	 tool_tip="The port of the HTTP proxy you would like to use."
 	 width="145" />
 	<text
 	 type="string"
@@ -162,18 +162,18 @@
 	 name="socks_proxy_port"
 	 top_delta="0"
 	 width="145"
-     tool_tip="The port of the SOCKS 5 proxy you would like to use."
-	 commit_callback.function="Pref.SocksProxy" />
+	 tool_tip="The port of the SOCKS 5 proxy you would like to use."
+	 commit_callback.function="Proxy.Change" />
 	<text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="10"
-     layout="topleft"
-     left="16"
-     name="Proxy location"
-     top_delta="35"
-     width="300">
+	 type="string"
+	 length="1"
+	 follows="left|top"
+	 height="10"
+	 layout="topleft"
+	 left="16"
+	 name="Proxy location"
+	 top_delta="35"
+	 width="300">
 	    Authentication:
 	</text>
 	<radio_group
@@ -186,13 +186,13 @@
 	 width="120"
 	 border="1"
 	 commit_callback.function="Proxy.Change" >
-	    <radio_item
+		<radio_item
 		 height="16"
 		 label="No Authentication"
 		 layout="topleft"
 		 name="Socks5NoAuth"
 		 value="None"
-		 tool_tip="Socks5 proxy requires no authentication."/>
+		 tool_tip="Socks5 proxy requires no authentication."
 		 width="120" />
 		<radio_item
 		 height="16"
@@ -200,7 +200,7 @@
 		 layout="topleft"
 		 name="Socks5UserPass"
 		 value="UserPass"
-		 tool_tip="Socks5 proxy requires username/password authentication."/>
+		 tool_tip="Socks5 proxy requires username/password authentication."
 		 width="120" />
 	</radio_group>
 	<text
@@ -215,7 +215,6 @@
 	    Username:
 	</text>
 	<line_editor
-	 control_name="Socks5Username"
 	 follows="left|top"
 	 font="SansSerif"
 	 height="23"
@@ -238,7 +237,6 @@
 	    Password:
 	</text>
 	<line_editor
-	 control_name="Socks5Password"
 	 follows="left|top"
 	 font="SansSerif"
 	 height="23"
@@ -248,6 +246,7 @@
 	 tool_tip="The password used to authenticate with your SOCKS 5 server"
 	 top_pad="4"
 	 width="200"
+	 is_password="true"
 	 commit_callback.function="Proxy.Change" />
 	<button
 	 follows="left|top"
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 06a9baf8c8..7bf742d949 100755
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -7164,7 +7164,8 @@ Click and drag anywhere on the world to rotate your view
    icon="alertmodal.tga"
    name="SOCKS_NOT_PERMITTED"
    type="alertmodal">
-	The Socks5 proxy "[HOST]:[PORT]" refused the connection, not allowed by rule set
+	The SOCKS 5 proxy "[HOST]:[PORT]" refused the connection, not allowed by rule set
+	<tag>fail</tag>
    <usetemplate
      name="okbutton"
      yestext="OK"/>
@@ -7174,7 +7175,8 @@ Click and drag anywhere on the world to rotate your view
    icon="alertmodal.tga"
    name="SOCKS_CONNECT_ERROR"
    type="alertmodal">
-	The Socks5 proxy "[HOST]:[PORT]" refused the connection, could not open TCP channel
+	The SOCKS 5 proxy "[HOST]:[PORT]" refused the connection, could not open TCP channel
+	<tag>fail</tag>
    <usetemplate
      name="okbutton"
      yestext="OK"/>	 
@@ -7184,7 +7186,8 @@ Click and drag anywhere on the world to rotate your view
    icon="alertmodal.tga"
    name="SOCKS_NOT_ACCEPTABLE"
    type="alertmodal">
-	The Socks5 proxy "[HOST]:[PORT]" refused the selected authentication system
+	The SOCKS 5 proxy "[HOST]:[PORT]" refused the selected authentication system
+	<tag>fail</tag>
    <usetemplate
      name="okbutton"
      yestext="OK"/>
@@ -7194,7 +7197,8 @@ Click and drag anywhere on the world to rotate your view
    icon="alertmodal.tga"
    name="SOCKS_AUTH_FAIL"
    type="alertmodal">
-	The Socks5 proxy "[HOST]:[PORT]" reported your credentials are invalid
+	The SOCKS 5 proxy "[HOST]:[PORT]" reported your credentials are invalid
+	<tag>fail</tag>
    <usetemplate
      name="okbutton"
      yestext="OK"/>
@@ -7204,7 +7208,8 @@ Click and drag anywhere on the world to rotate your view
    icon="alertmodal.tga"
    name="SOCKS_UDP_FWD_NOT_GRANTED"
    type="alertmodal">
-	The Socks5 proxy "[HOST]:[PORT]" refused the UDP associate request
+	The SOCKS 5 proxy "[HOST]:[PORT]" refused the UDP associate request
+	<tag>fail</tag>
    <usetemplate
      name="okbutton"
      yestext="OK"/>
@@ -7214,7 +7219,8 @@ Click and drag anywhere on the world to rotate your view
    icon="alertmodal.tga"
    name="SOCKS_HOST_CONNECT_FAILED"
    type="alertmodal">
-	Could not connect to Socks5 proxy server "[HOST]:[PORT]"
+	Could not connect to SOCKS 5 proxy server "[HOST]:[PORT]"
+	<tag>fail</tag>
    <usetemplate
      name="okbutton"
      yestext="OK"/>
@@ -7224,7 +7230,8 @@ Click and drag anywhere on the world to rotate your view
    icon="alertmodal.tga"
    name="ChangeSocks5Settings"
    type="alert">
-	Socks 5 proxy settings take effect after you restart [APP_NAME].
+	SOCKS 5 proxy settings take effect after you restart [APP_NAME].
+	<tag>fail</tag>
    <usetemplate
      name="okbutton"
      yestext="OK"/>
diff --git a/indra/newview/skins/default/xui/en/panel_cof_wearables.xml b/indra/newview/skins/default/xui/en/panel_cof_wearables.xml
index bbeb592e96..beea53437a 100644
--- a/indra/newview/skins/default/xui/en/panel_cof_wearables.xml
+++ b/indra/newview/skins/default/xui/en/panel_cof_wearables.xml
@@ -52,7 +52,7 @@
              multi_select="true"
              name="list_attachments"
              top="0"
-             width="311">
+			 width="311" />
         </accordion_tab>
         <accordion_tab
          layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml
index 30be5bc853..47236c1a48 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml
@@ -139,7 +139,7 @@
      height="16"
      label="Add datestamp to log file name."
      layout="topleft"
-     left_detla="5"
+     left_delta="5"
      name="logfile_name_datestamp"
      top_pad="10"
      width="350"/>
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 d306e46d5e..b0281b11fd 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_setup.xml
@@ -79,7 +79,7 @@
   <spinner
    control_name="ConnectionPort"
    enabled_control="ConnectionPortEnabled"
- decimal_digits="0"
+   decimal_digits="0"
    follows="left|top"
    height="23"
    increment="1"
-- 
cgit v1.2.3


From 73afcff635f3d25432167ca43ab0b82aadd6c687 Mon Sep 17 00:00:00 2001
From: Logan Dethrow <log@lindenlab.com>
Date: Thu, 30 Jun 2011 18:31:53 -0400
Subject: STORM-1112 Rearranged proxy preferences panels.

---
 .../default/xui/en/floater_preferences_proxy.xml   | 175 +++++++++++----------
 1 file changed, 88 insertions(+), 87 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_preferences_proxy.xml b/indra/newview/skins/default/xui/en/floater_preferences_proxy.xml
index 53060b0326..91e85c812c 100644
--- a/indra/newview/skins/default/xui/en/floater_preferences_proxy.xml
+++ b/indra/newview/skins/default/xui/en/floater_preferences_proxy.xml
@@ -1,92 +1,36 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater
  legacy_header_height="18"
- height="490"
+ height="500"
  layout="topleft"
  name="Proxy Settings Floater"
- help_topic="hardware_settings_floater"
- title="Socks5 proxy advanced settings"
- width="385">
+ help_topic="proxy_settings_floater"
+ title="Proxy Settings"
+ width="500">
 	<check_box
 	 control_name="BrowserProxyEnabled"
-	 top="30"
+	 top="38"
 	 enabled="true"
 	 follows="left|top"
 	 height="14"
 	 initial_value="false"
 	 commit_callback.function="Proxy.Change"
 	 label="Use HTTP Proxy for Web pages"
-	 left_delta="10"
+	 left="22"
 	 mouse_opaque="true"
 	 name="web_proxy_enabled"
 	 radio_style="false"
 	 width="400"
 	 top_pad="5" />
-	<check_box
-	 control_name="Socks5ProxyEnabled"
-	 height="16"
-	 label="Use Socks 5 Proxy for UDP traffic"
-	 layout="topleft"
-	 left_delta="0"
-	 name="socks_proxy_enabled"
-	 top_pad="5"
-	 width="256"
-	 commit_callback.function="Proxy.Change" />
-	<text
-	type="string"
-	length="1"
-	follows="left|top"
-	height="10"
-	layout="topleft"
-	left="10"
-	name="Proxy location"
-	top_delta="30"
-	width="300">
-	   Other Http traffic proxy:
-	</text>
-	<radio_group
-	 control_name="Socks5HttpProxyType"
-	 height="60"
-	 layout="topleft"
-	 name="other_http_proxy_selection"
-	 top_pad="10"
-	 width="120"
-	 border="1"
-	 left_delta="10" 
-	 commit_callback.function="Proxy.Change" >
-		<radio_item
-		 height="16"
-		 label="Do not proxy"
-		 layout="topleft"
-		 value="None"
-		 width="120"
-		 tool_tip="Non web Http traffic should NOT be sent to any proxy."/>
-		<radio_item
-		 height="16"
-		 label="Use Socks 5 Proxy"
-		 layout="topleft"
-		 value="Socks"
-		 width="120"
-		 enabled_control="Socks5ProxyEnabled"
-		 tool_tip="Non-web Http will be sent to the configured Socks 5 proxy."/>
-		<radio_item
-		 height="16"
-		 label="Use Http Proxy"
-		 layout="topleft"
-		 value="Web"
-		 width="120"
-		 enabled_control="BrowserProxyEnabled"
-		 tool_tip="Non-web Http will be sent to the configured Web proxy." />
-	</radio_group>
 	<text
 	 type="string"
 	 length="1"
 	 follows="left|top"
 	 height="10"
-	 left="15"
+	 left_delta="23"
 	 layout="topleft"
 	 name="Proxy location"
-	 top_delta="82"
+	 top_pad="10"
 	 width="300">
 	    HTTP Proxy:
 	</text>
@@ -120,15 +64,25 @@
 	 top_delta="0"
 	 tool_tip="The port of the HTTP proxy you would like to use."
 	 width="145" />
+	<check_box
+	 control_name="Socks5ProxyEnabled"
+	 height="16"
+	 label="Use SOCKS 5 Proxy for UDP traffic"
+	 layout="topleft"
+	 left="22"
+	 name="socks_proxy_enabled"
+	 top_pad="32"
+	 width="256"
+	 commit_callback.function="Proxy.Change" />
 	<text
 	 type="string"
 	 length="1"
 	 follows="left|top"
 	 height="10"
 	 layout="topleft"
-	 left="15"
+	 left_delta="23"
 	 name="Proxy location"
-	 top_delta="32"
+	 top_pad="10"
 	 width="300">
 	    SOCKS 5 Proxy:
 	</text>
@@ -170,11 +124,11 @@
 	 follows="left|top"
 	 height="10"
 	 layout="topleft"
-	 left="16"
+	 left="40"
 	 name="Proxy location"
-	 top_delta="35"
+	 top_pad="15"
 	 width="300">
-	    Authentication:
+	    SOCKS Authentication:
 	</text>
 	<radio_group
 	 control_name="Socks5AuthType"
@@ -211,52 +165,97 @@
 	 layout="topleft"
 	 left_delta="20"
 	 top_delta="50"
-	 width="300">
+	 width="200">
 	    Username:
 	</text>
+	<text
+	 type="string"
+	 length="1"
+	 follows="left|top"
+	 height="10"
+	 left_pad="15"
+	 layout="topleft"
+	 width="200">
+	    Password:
+	</text>
 	<line_editor
 	 follows="left|top"
 	 font="SansSerif"
 	 height="23"
 	 layout="topleft"
-	 left_delta="0"
+	 left="60"
 	 name="socks5_username"
 	 tool_tip="The username used to authenticate with your SOCKS 5 server"
 	 top_pad="4"
 	 width="200"
 	 commit_callback.function="Proxy.Change" />
-	<text
-	 type="string"
-	 length="1"
-	 follows="left|top"
-	 height="10"
-	 layout="topleft"
-	 left_delta="0"
-	 top_delta="30"
-	 width="300">
-	    Password:
-	</text>
 	<line_editor
 	 follows="left|top"
 	 font="SansSerif"
 	 height="23"
 	 layout="topleft"
-	 left_delta="0"
+	 left_pad="15"
 	 name="socks5_password"
 	 tool_tip="The password used to authenticate with your SOCKS 5 server"
-	 top_pad="4"
+	 top_delta="0"
 	 width="200"
 	 is_password="true"
 	 commit_callback.function="Proxy.Change" />
+	<text
+	 type="string"
+	 length="1"
+	 follows="left|top"
+	 height="10"
+	 layout="topleft"
+	 left="25"
+	 name="Proxy location"
+	 top_pad="18"
+	 width="300">
+	   Other HTTP traffic proxy:
+	</text>
+	<radio_group
+	 control_name="Socks5HttpProxyType"
+	 height="60"
+	 layout="topleft"
+	 name="other_http_proxy_selection"
+	 top_pad="9"
+	 width="120"
+	 border="1"
+	 left_delta="15" 
+	 commit_callback.function="Proxy.Change" >
+		<radio_item
+		 height="16"
+		 label="Do not proxy"
+		 layout="topleft"
+		 value="None"
+		 width="120"
+		 tool_tip="Non-web HTTP traffic will NOT be sent to any proxy."/>
+		<radio_item
+		 height="16"
+		 label="Use SOCKS 5 Proxy"
+		 layout="topleft"
+		 value="Socks"
+		 width="120"
+		 enabled_control="Socks5ProxyEnabled"
+		 tool_tip="Non-web HTTP traffic will be sent through the configured Socks 5 proxy."/>
+		<radio_item
+		 height="16"
+		 label="Use HTTP Proxy"
+		 layout="topleft"
+		 value="Web"
+		 width="120"
+		 enabled_control="BrowserProxyEnabled"
+		 tool_tip="Non-web HTTP will be sent through the configured Web proxy." />
+	</radio_group>
 	<button
 	 follows="left|top"
 	 height="22"
 	 label="OK"
 	 label_selected="OK"
 	 layout="topleft"
-	 right="275"
+	 left="282"
 	 name="OK"
-	 top_delta="53"
+	 top_pad="36"
 	 width="90"
 	 commit_callback.function="Proxy.OK" />
 	<button
@@ -265,9 +264,11 @@
 	 label="Cancel"
 	 label_selected="Cancel"
 	 layout="topleft"
-	 right="375"
+	 left_pad="10"
 	 name="Cancel"
 	 top_delta="0"
 	 width="90"
 	 commit_callback.function="Proxy.Cancel" />
+	 
+	 
 </floater>
-- 
cgit v1.2.3


From 975975029d7f248cdf917da670ffd6c6b98d40c1 Mon Sep 17 00:00:00 2001
From: Logan Dethrow <log@lindenlab.com>
Date: Tue, 5 Jul 2011 16:55:43 -0400
Subject: STORM-1112 Fixed crash on quit. Other minor fixes:

* Reordered HTTP proxy choices in settings dialog
* Now using setBlocking and setNonBlocking LLSocket methods during TCP handshakes.
* Made those LLSocket methods available outside the class.
---
 .../skins/default/xui/en/floater_preferences_proxy.xml  | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_preferences_proxy.xml b/indra/newview/skins/default/xui/en/floater_preferences_proxy.xml
index 91e85c812c..020ee52c18 100644
--- a/indra/newview/skins/default/xui/en/floater_preferences_proxy.xml
+++ b/indra/newview/skins/default/xui/en/floater_preferences_proxy.xml
@@ -217,7 +217,6 @@
 	 control_name="Socks5HttpProxyType"
 	 height="60"
 	 layout="topleft"
-	 name="other_http_proxy_selection"
 	 top_pad="9"
 	 width="120"
 	 border="1"
@@ -230,14 +229,6 @@
 		 value="None"
 		 width="120"
 		 tool_tip="Non-web HTTP traffic will NOT be sent to any proxy."/>
-		<radio_item
-		 height="16"
-		 label="Use SOCKS 5 Proxy"
-		 layout="topleft"
-		 value="Socks"
-		 width="120"
-		 enabled_control="Socks5ProxyEnabled"
-		 tool_tip="Non-web HTTP traffic will be sent through the configured Socks 5 proxy."/>
 		<radio_item
 		 height="16"
 		 label="Use HTTP Proxy"
@@ -246,6 +237,14 @@
 		 width="120"
 		 enabled_control="BrowserProxyEnabled"
 		 tool_tip="Non-web HTTP will be sent through the configured Web proxy." />
+		<radio_item
+		 height="16"
+		 label="Use SOCKS 5 Proxy"
+		 layout="topleft"
+		 value="Socks"
+		 width="120"
+		 enabled_control="Socks5ProxyEnabled"
+		 tool_tip="Non-web HTTP traffic will be sent through the configured Socks 5 proxy."/>
 	</radio_group>
 	<button
 	 follows="left|top"
-- 
cgit v1.2.3


From 9a888818c91e62112bafc5a45eea7f584f06c035 Mon Sep 17 00:00:00 2001
From: Logan Dethrow <log@lindenlab.com>
Date: Mon, 11 Jul 2011 11:38:10 -0400
Subject: Renamed proxy settings in xui.

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

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

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 b0281b11fd..4a3489f347 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_setup.xml
@@ -239,7 +239,7 @@
      height="10"
      layout="topleft"
      left="30"
-     name="Software updates:"
+     name="Proxy Settings:"
      mouse_opaque="false"
      top_pad="5"
      width="300">
-- 
cgit v1.2.3


From f15d28a636da7b6d2784d9301e7a030b5bd38a8c Mon Sep 17 00:00:00 2001
From: Logan Dethrow <log@lindenlab.com>
Date: Thu, 28 Jul 2011 13:47:20 -0400
Subject: Proxy cleanup in llstartup.cpp and llproxy.cpp.

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

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

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 78685dbd79..8b7e6d8c4e 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -7207,6 +7207,17 @@ Click and drag anywhere on the world to rotate your view
      name="okbutton"
      yestext="OK"/>
   </notification>
+  
+  <notification
+   icon="alertmodal.tga"
+   name="SOCKS_UNKNOWN_STATUS"
+   type="alertmodal">
+	Unknown SOCKS error with server "[HOST]:[PORT]"
+	<tag>fail</tag>
+   <usetemplate
+     name="okbutton"
+     yestext="OK"/>
+  </notification>
 
   <notification
    icon="alertmodal.tga"
-- 
cgit v1.2.3


From d2c72cb7e92896cb414e357ef262d91b0498a6b7 Mon Sep 17 00:00:00 2001
From: Logan Dethrow <log@lindenlab.com>
Date: Fri, 29 Jul 2011 15:38:20 -0400
Subject: STORM-1112 Input sanitization of proxy options.

---
 .../newview/skins/default/xui/en/notifications.xml | 44 ++++++++++++++++++++++
 1 file changed, 44 insertions(+)

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

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 8b7e6d8c4e..ccc678d942 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -7218,6 +7218,50 @@ Click and drag anywhere on the world to rotate your view
      name="okbutton"
      yestext="OK"/>
   </notification>
+  
+  <notification
+   icon="alertmodal.tga"
+   name="SOCKS_INVALID_HOST"
+   type="alertmodal">
+	Invalid SOCKS proxy address or port "[HOST]:[PORT]".
+	<tag>fail</tag>
+   <usetemplate
+     name="okbutton"
+     yestext="OK"/>
+  </notification>
+  
+  <notification
+   icon="alertmodal.tga"
+   name="SOCKS_BAD_CREDS"
+   type="alertmodal">
+	Invalid SOCKS 5 username or password.
+	<tag>fail</tag>
+   <usetemplate
+     name="okbutton"
+     yestext="OK"/>
+  </notification>
+  
+  <notification
+   icon="alertmodal.tga"
+   name="PROXY_INVALID_HTTP_HOST"
+   type="alertmodal">
+    Invalid HTTP proxy address or port "[HOST]:[PORT]".
+	<tag>fail</tag>
+   <usetemplate
+     name="okbutton"
+     yestext="OK"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="PROXY_INVALID_SOCKS_HOST"
+   type="alertmodal">
+	Invalid SOCKS proxy address or port "[HOST]:[PORT]".
+	<tag>fail</tag>
+   <usetemplate
+     name="okbutton"
+     yestext="OK"/>
+  </notification>
 
   <notification
    icon="alertmodal.tga"
-- 
cgit v1.2.3


From cff5251f064005f213a905f6eb41b5b7ef8c954b Mon Sep 17 00:00:00 2001
From: Logan Dethrow <log@lindenlab.com>
Date: Fri, 12 Aug 2011 14:23:43 -0400
Subject: LLProxy: xui string cleanup.

---
 .../skins/default/xui/en/floater_preferences_proxy.xml |  2 +-
 indra/newview/skins/default/xui/en/notifications.xml   | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_preferences_proxy.xml b/indra/newview/skins/default/xui/en/floater_preferences_proxy.xml
index 020ee52c18..fb5f85bf58 100644
--- a/indra/newview/skins/default/xui/en/floater_preferences_proxy.xml
+++ b/indra/newview/skins/default/xui/en/floater_preferences_proxy.xml
@@ -4,7 +4,7 @@
  height="500"
  layout="topleft"
  name="Proxy Settings Floater"
- help_topic="proxy_settings_floater"
+ help_topic="proxysettings"
  title="Proxy Settings"
  width="500">
 	<check_box
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 6867305b70..5aa66b2bd3 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -7160,7 +7160,7 @@ Click and drag anywhere on the world to rotate your view
    icon="alertmodal.tga"
    name="SOCKS_NOT_PERMITTED"
    type="alertmodal">
-	The SOCKS 5 proxy "[HOST]:[PORT]" refused the connection, not allowed by rule set
+	The SOCKS 5 proxy "[HOST]:[PORT]" refused the connection, not allowed by rule set.
 	<tag>fail</tag>
    <usetemplate
      name="okbutton"
@@ -7171,7 +7171,7 @@ Click and drag anywhere on the world to rotate your view
    icon="alertmodal.tga"
    name="SOCKS_CONNECT_ERROR"
    type="alertmodal">
-	The SOCKS 5 proxy "[HOST]:[PORT]" refused the connection, could not open TCP channel
+	The SOCKS 5 proxy "[HOST]:[PORT]" refused the connection, could not open TCP channel.
 	<tag>fail</tag>
    <usetemplate
      name="okbutton"
@@ -7182,7 +7182,7 @@ Click and drag anywhere on the world to rotate your view
    icon="alertmodal.tga"
    name="SOCKS_NOT_ACCEPTABLE"
    type="alertmodal">
-	The SOCKS 5 proxy "[HOST]:[PORT]" refused the selected authentication system
+	The SOCKS 5 proxy "[HOST]:[PORT]" refused the selected authentication system.
 	<tag>fail</tag>
    <usetemplate
      name="okbutton"
@@ -7193,7 +7193,7 @@ Click and drag anywhere on the world to rotate your view
    icon="alertmodal.tga"
    name="SOCKS_AUTH_FAIL"
    type="alertmodal">
-	The SOCKS 5 proxy "[HOST]:[PORT]" reported your credentials are invalid
+	The SOCKS 5 proxy "[HOST]:[PORT]" reported your credentials are invalid.
 	<tag>fail</tag>
    <usetemplate
      name="okbutton"
@@ -7204,7 +7204,7 @@ Click and drag anywhere on the world to rotate your view
    icon="alertmodal.tga"
    name="SOCKS_UDP_FWD_NOT_GRANTED"
    type="alertmodal">
-	The SOCKS 5 proxy "[HOST]:[PORT]" refused the UDP associate request
+	The SOCKS 5 proxy "[HOST]:[PORT]" refused the UDP associate request.
 	<tag>fail</tag>
    <usetemplate
      name="okbutton"
@@ -7215,7 +7215,7 @@ Click and drag anywhere on the world to rotate your view
    icon="alertmodal.tga"
    name="SOCKS_HOST_CONNECT_FAILED"
    type="alertmodal">
-	Could not connect to SOCKS 5 proxy server "[HOST]:[PORT]"
+	Could not connect to SOCKS 5 proxy server "[HOST]:[PORT]".
 	<tag>fail</tag>
    <usetemplate
      name="okbutton"
@@ -7226,7 +7226,7 @@ Click and drag anywhere on the world to rotate your view
    icon="alertmodal.tga"
    name="SOCKS_UNKNOWN_STATUS"
    type="alertmodal">
-	Unknown SOCKS error with server "[HOST]:[PORT]"
+	Unknown proxy error with server "[HOST]:[PORT]".
 	<tag>fail</tag>
    <usetemplate
      name="okbutton"
@@ -7279,9 +7279,9 @@ Click and drag anywhere on the world to rotate your view
 
   <notification
    icon="alertmodal.tga"
-   name="ChangeSocks5Settings"
+   name="ChangeProxySettings"
    type="alert">
-	SOCKS 5 proxy settings take effect after you restart [APP_NAME].
+	Proxy settings take effect after you restart [APP_NAME].
 	<tag>fail</tag>
    <usetemplate
      name="okbutton"
-- 
cgit v1.2.3


From d79eedcfc3bbd0c72505bcf9bec98532a6fd5feb Mon Sep 17 00:00:00 2001
From: Logan Dethrow <log@lindenlab.com>
Date: Thu, 18 Aug 2011 16:07:33 -0400
Subject: LLProxy: Renamed a setting to better describe what it controls.

---
 indra/newview/skins/default/xui/en/floater_preferences_proxy.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_preferences_proxy.xml b/indra/newview/skins/default/xui/en/floater_preferences_proxy.xml
index fb5f85bf58..35cd118130 100644
--- a/indra/newview/skins/default/xui/en/floater_preferences_proxy.xml
+++ b/indra/newview/skins/default/xui/en/floater_preferences_proxy.xml
@@ -214,7 +214,7 @@
 	   Other HTTP traffic proxy:
 	</text>
 	<radio_group
-	 control_name="Socks5HttpProxyType"
+	 control_name="HttpProxyType"
 	 height="60"
 	 layout="topleft"
 	 top_pad="9"
-- 
cgit v1.2.3


From 05e5ea243ea2acc9e86471c884d1a2d39c9c8e60 Mon Sep 17 00:00:00 2001
From: Logan Dethrow <log@lindenlab.com>
Date: Tue, 23 Aug 2011 17:06:38 -0400
Subject: Fixed LLProxy UI constraints.  Fixed some XUI warnings in the Proxy
 Settings Floater.

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

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

diff --git a/indra/newview/skins/default/xui/en/floater_preferences_proxy.xml b/indra/newview/skins/default/xui/en/floater_preferences_proxy.xml
index 35cd118130..449731ab89 100644
--- a/indra/newview/skins/default/xui/en/floater_preferences_proxy.xml
+++ b/indra/newview/skins/default/xui/en/floater_preferences_proxy.xml
@@ -138,7 +138,6 @@
 	 name="socks5_auth_type"
 	 top_pad="10"
 	 width="120"
-	 border="1"
 	 commit_callback.function="Proxy.Change" >
 		<radio_item
 		 height="16"
@@ -215,17 +214,18 @@
 	</text>
 	<radio_group
 	 control_name="HttpProxyType"
+	 name="other_http_proxy_type"
 	 height="60"
 	 layout="topleft"
 	 top_pad="9"
 	 width="120"
-	 border="1"
 	 left_delta="15" 
 	 commit_callback.function="Proxy.Change" >
 		<radio_item
 		 height="16"
 		 label="Do not proxy"
 		 layout="topleft"
+		 name="OtherNoProxy"
 		 value="None"
 		 width="120"
 		 tool_tip="Non-web HTTP traffic will NOT be sent to any proxy."/>
@@ -233,6 +233,7 @@
 		 height="16"
 		 label="Use HTTP Proxy"
 		 layout="topleft"
+		 name="OtherHTTPProxy"
 		 value="Web"
 		 width="120"
 		 enabled_control="BrowserProxyEnabled"
@@ -241,6 +242,7 @@
 		 height="16"
 		 label="Use SOCKS 5 Proxy"
 		 layout="topleft"
+		 name="OtherSocksProxy"
 		 value="Socks"
 		 width="120"
 		 enabled_control="Socks5ProxyEnabled"
@@ -268,6 +270,4 @@
 	 top_delta="0"
 	 width="90"
 	 commit_callback.function="Proxy.Cancel" />
-	 
-	 
 </floater>
-- 
cgit v1.2.3


From d1de4862dfd35a669f3589ff59cef2b61e0bfa25 Mon Sep 17 00:00:00 2001
From: Vadim ProductEngine <vsavchuk@productengine.com>
Date: Wed, 31 Aug 2011 13:14:12 +0300
Subject: STORM-1576 FIXED The "Show" button in agent-to-agent inventory offers
 didn't work.

Fixed the button index, which became invalid after removing the IOR_BUSY
response in the recent fix of STORM-1543 (changeset 526d86e69101).
---
 indra/newview/skins/default/xui/en/notifications.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 104bcaf7d0..e3c649ab38 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -5928,7 +5928,7 @@ An object named &lt;nolink&gt;[OBJECTFROMNAME]&lt;/nolink&gt; owned by [NAME_SLU
 [ITEM_SLURL]
     <form name="form">
       <button
-       index="4"
+       index="3"
        name="Show"
        text="Show"/>
       <button
-- 
cgit v1.2.3