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

---
 indra/newview/app_settings/settings.xml | 77 +++++++++++++++++++++++++++++++++
 1 file changed, 77 insertions(+)

(limited to 'indra/newview/app_settings')

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index f0e28d4ae3..2b7b7b8484 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -774,6 +774,83 @@
       <key>Value</key>
       <integer>5</integer>
     </map>
+    <key>Socks5ProxyEnabled</key>
+    <map>
+      <key>Comment</key>
+      <string>Use Socks5 Proxy</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>1</integer>
+    </map>
+    <key>Socks5HttpProxyType</key>
+    <map>
+      <key>Comment</key>
+      <string>Proxy type to use for HTTP operations</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>String</string>
+      <key>Value</key>
+      <string>Socks</string>
+    </map>
+    <key>Socks5ProxyHost</key>
+    <map>
+      <key>Comment</key>
+      <string>Socks 5 Proxy Host</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>String</string>
+      <key>Value</key>
+      <string>64.79.219.97</string>
+    </map>
+    <key>Socks5ProxyPort</key>
+    <map>
+      <key>Comment</key>
+      <string>Socks 5 Proxy Port</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>U32</string>
+      <key>Value</key>
+      <integer>1080</integer>
+    </map>
+     <key>Socks5Username</key>
+    <map>
+      <key>Comment</key>
+      <string>Socks 5 Username</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>String</string>
+      <key>Value</key>
+      <string></string>
+    </map>
+    <key>Socks5Password</key>
+    <map>
+      <key>Comment</key>
+      <string>Socks 5 Password</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>String</string>
+      <key>Value</key>
+      <string></string>
+    </map>
+    <key>Socks5AuthType</key>
+    <map>
+      <key>Comment</key>
+      <string>Selected Auth mechanism for Socks5</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>String</string>
+      <key>Value</key>
+      <string>None</string>
+    </map>
     <key>BuildAxisDeadZone0</key>
     <map>
       <key>Comment</key>
-- 
cgit v1.2.3


From e610304af1032f21ac01a06a5ea37460ca6da42c Mon Sep 17 00:00:00 2001
From: Logan Dethrow <log@lindenlab.com>
Date: Thu, 7 Jul 2011 20:14:19 -0400
Subject: STORM-1112 Disable SOCKS 5 proxy by default.

---
 indra/newview/app_settings/settings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/app_settings')

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index befc81f28e..032092fd6c 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -805,7 +805,7 @@
       <key>Type</key>
       <string>Boolean</string>
       <key>Value</key>
-      <integer>1</integer>
+      <integer>0</integer>
     </map>
     <key>Socks5HttpProxyType</key>
     <map>
-- 
cgit v1.2.3


From 543943279894d76662833c3b4e35efd7d09a91fc Mon Sep 17 00:00:00 2001
From: Logan Dethrow <log@lindenlab.com>
Date: Tue, 12 Jul 2011 13:57:41 -0400
Subject: Removed default proxy server.

---
 indra/newview/app_settings/settings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/app_settings')

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 032092fd6c..85f2215850 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -827,7 +827,7 @@
       <key>Type</key>
       <string>String</string>
       <key>Value</key>
-      <string>64.79.219.97</string>
+      <string></string>
     </map>
     <key>Socks5ProxyPort</key>
     <map>
-- 
cgit v1.2.3


From cb24dff9e36a963af280be1aead9424be8a678b6 Mon Sep 17 00:00:00 2001
From: Logan Dethrow <log@lindenlab.com>
Date: Wed, 13 Jul 2011 16:46:36 -0400
Subject: Code cleanup for the SOCKS 5 proxy viewer.

---
 indra/newview/app_settings/settings.xml | 22 ----------------------
 1 file changed, 22 deletions(-)

(limited to 'indra/newview/app_settings')

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index f8b3001aa5..55bab3064f 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -839,28 +839,6 @@
       <string>U32</string>
       <key>Value</key>
       <integer>1080</integer>
-    </map>
-     <key>Socks5Username</key>
-    <map>
-      <key>Comment</key>
-      <string>Socks 5 Username</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>String</string>
-      <key>Value</key>
-      <string></string>
-    </map>
-    <key>Socks5Password</key>
-    <map>
-      <key>Comment</key>
-      <string>Socks 5 Password</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>String</string>
-      <key>Value</key>
-      <string></string>
     </map>
     <key>Socks5AuthType</key>
     <map>
-- 
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/app_settings/settings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/app_settings')

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index d7536bea7a..7a617bb468 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -809,7 +809,7 @@
       <key>Value</key>
       <integer>0</integer>
     </map>
-    <key>Socks5HttpProxyType</key>
+    <key>HttpProxyType</key>
     <map>
       <key>Comment</key>
       <string>Proxy type to use for HTTP operations</string>
-- 
cgit v1.2.3


From e7fb4ef9541400b00fb570d5c385eafa7eb60c41 Mon Sep 17 00:00:00 2001
From: Vadim ProductEngine <vsavchuk@productengine.com>
Date: Mon, 22 Aug 2011 14:23:34 +0300
Subject: STORM-1542 FIXED Changed search URL back from search-beta to
 search.sl.com.

---
 indra/newview/app_settings/settings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/app_settings')

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 7c01731282..7fb5c4d2dc 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -3993,7 +3993,7 @@
       <key>Type</key>
       <string>String</string>
       <key>Value</key>
-      <string>http://search-beta.secondlife.com/viewer/[CATEGORY]/?q=[QUERY]</string>
+      <string>http://search.secondlife.com/viewer/[CATEGORY]/?q=[QUERY]</string>
     </map>
     <key>WebProfileURL</key>
     <map>
-- 
cgit v1.2.3