Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Put in some changes along sg1.4 dev history.

Browse Source
This commit is contained in:
Siana Gearz
2010-11-21 04:28:31 +01:00
parent 6866a36a5c
commit d68736da39
182 changed files with 2418 additions and 1151 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/llpanelnetwork.cpp
View File

@@ -74,7 +74,6 @@ BOOL LLPanelNetwork::postBuild()
//Socks 5 proxy settings, saved data
childSetValue("socks5_proxy_enabled", gSavedSettings.getBOOL("Socks5ProxyEnabled"));
//childSetValue("socks5_http_enabled", gSavedSettings.getBOOL("Socks5HttpEnabled"));
childSetValue("socks5_http_proxy_type", gSavedSettings.getString("Socks5HttpProxyType"));
childSetValue("socks5_proxy_host", gSavedSettings.getString("Socks5ProxyHost"));
@@ -110,7 +109,6 @@ void LLPanelNetwork::apply()
gSavedSettings.setU32("ConnectionPort", childGetValue("connection_port").asInteger());
gSavedSettings.setBOOL("Socks5ProxyEnabled", childGetValue("socks5_proxy_enabled"));
//gSavedSettings.setBOOL("Socks5HttpEnabled", childGetValue("socks5_http_enabled"));
gSavedSettings.setString("Socks5HttpProxyType", childGetValue("socks5_http_proxy_type"));
gSavedSettings.setString("Socks5ProxyHost", childGetValue("socks5_proxy_host"));
gSavedSettings.setU32("Socks5ProxyPort", childGetValue("socks5_proxy_port").asInteger());