aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llcontroldef.cpp
diff options
context:
space:
mode:
authorJacek Antonelli2008-08-15 23:45:23 -0500
committerJacek Antonelli2008-08-15 23:45:23 -0500
commit486c4774ab4a707d69c1b48cdc048af1369084db (patch)
tree2a206a7e32a9a7efb98d585798a9fa18baeaf171 /linden/indra/newview/llcontroldef.cpp
parentSecond Life viewer sources 1.18.6.1-RC (diff)
downloadmeta-impy-486c4774ab4a707d69c1b48cdc048af1369084db.zip
meta-impy-486c4774ab4a707d69c1b48cdc048af1369084db.tar.gz
meta-impy-486c4774ab4a707d69c1b48cdc048af1369084db.tar.bz2
meta-impy-486c4774ab4a707d69c1b48cdc048af1369084db.tar.xz
Second Life viewer sources 1.18.6.2-RC
Diffstat (limited to 'linden/indra/newview/llcontroldef.cpp')
-rw-r--r--linden/indra/newview/llcontroldef.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/linden/indra/newview/llcontroldef.cpp b/linden/indra/newview/llcontroldef.cpp
index 45b8be3..1ead6ab 100644
--- a/linden/indra/newview/llcontroldef.cpp
+++ b/linden/indra/newview/llcontroldef.cpp
@@ -1424,9 +1424,9 @@ void declare_settings()
1424 gSavedSettings.declareString("BrowserHomePage", "http://www.secondlife.com", "[NOT USED]"); 1424 gSavedSettings.declareString("BrowserHomePage", "http://www.secondlife.com", "[NOT USED]");
1425 1425
1426 // browser proxy variables 1426 // browser proxy variables
1427 gSavedSettings.declareBOOL("BrowserProxyEnabled", FALSE, "[NOT USED]"); 1427 gSavedSettings.declareBOOL("BrowserProxyEnabled", FALSE, "Use Web Proxy");
1428 gSavedSettings.declareString("BrowserProxyAddress", "", "[NOT USED]"); 1428 gSavedSettings.declareString("BrowserProxyAddress", "", "Address for the Web Proxy]");
1429 gSavedSettings.declareS32("BrowserProxyPort", 3128, "[NOT USED]"); 1429 gSavedSettings.declareS32("BrowserProxyPort", 3128, "Port for Web Proxy");
1430 gSavedSettings.declareS32("BrowserProxySocks45", 5, "[NOT USED]"); 1430 gSavedSettings.declareS32("BrowserProxySocks45", 5, "[NOT USED]");
1431 gSavedSettings.declareString("BrowserProxyExclusions", "", "[NOT USED]"); 1431 gSavedSettings.declareString("BrowserProxyExclusions", "", "[NOT USED]");
1432 1432