several embedded browser proxy fixes and one small cookie fix

* split xmlrpc and web browser proxy setting into 2 settings
  (because the login service might refuse to let you in using TOR)
* fix web proxy to be used not only for the browser floater but also for login screen and parcel media.
  Backported for that the setProxyConfig method from Viewer-external(last gpl+floss version)
* fix: no clear cookies button
* todo: cookies need work

note to devs of other viewers: if you find this useful feel free to apply my part to "lgpl v2.1 only" code without need to ask (thats all but setProxyConfig, which is anyway also released under lgpl  by LL ).

1 files changed, 24 insertions, 0 deletions

diff --git a/linden/indra/newview/llpanelnetwork.cpp b/linden/indra/newview/llpanelnetwork.cpp
index 2edd1a1..16b9a76 100644
--- a/linden/indra/newview/llpanelnetwork.cpp
+++ b/linden/indra/newview/llpanelnetwork.cpp
@@ -64,6 +64,14 @@ BOOL LLPanelNetwork::postBuild()
         childSetValue("connection_port_enabled", gSavedSettings.getBOOL("ConnectionPortEnabled"));
         childSetValue("connection_port", (F32)gSavedSettings.getU32("ConnectionPort"));
 
+        childSetCommitCallback("xmlrpc_proxy_enabled", onCommitXMLRPCProxyEnabled, this);
+        childSetValue("xmlrpc_proxy_enabled", gSavedSettings.getBOOL("XMLRPCProxyEnabled"));
+        childSetValue("xmlrpc_proxy_editor", gSavedSettings.getString("XMLRPCProxyAddress"));
+        childSetValue("xmlrpc_proxy_port", gSavedSettings.getS32("XMLRPCProxyPort"));
+        childSetEnabled("xmlrpc_proxy_text_label", gSavedSettings.getBOOL("XMLRPCProxyEnabled"));
+        childSetEnabled("xmlrpc_proxy_editor", gSavedSettings.getBOOL("XMLRPCProxyEnabled"));
+        childSetEnabled("xmlrpc_proxy_port", gSavedSettings.getBOOL("XMLRPCProxyEnabled"));
+
         return TRUE;
 }
 
@@ -79,6 +87,10 @@ void LLPanelNetwork::apply()
         gSavedSettings.setF32("ThrottleBandwidthKBPS", childGetValue("max_bandwidth").asReal());
         gSavedSettings.setBOOL("ConnectionPortEnabled", childGetValue("connection_port_enabled"));
         gSavedSettings.setU32("ConnectionPort", childGetValue("connection_port").asInteger());
+
+        gSavedSettings.setBOOL("XMLRPCProxyEnabled", childGetValue("xmlrpc_proxy_enabled"));
+        gSavedSettings.setString("XMLRPCProxyAddress", childGetValue("xmlrpc_proxy_editor"));
+        gSavedSettings.setS32("XMLRPCProxyPort", childGetValue("xmlrpc_proxy_port"));
 }
 
 void LLPanelNetwork::cancel()
@@ -144,3 +156,15 @@ void LLPanelNetwork::onCommitPort(LLUICtrl* ctrl, void* data)
   self->childSetEnabled("connection_port", check->get());
   LLNotifications::instance().add("ChangeConnectionPort");
 }
+
+// static
+void LLPanelNetwork::onCommitXMLRPCProxyEnabled(LLUICtrl* ctrl, void* data)
+{
+        LLPanelNetwork* self = (LLPanelNetwork*)data;
+        LLCheckBoxCtrl* check = (LLCheckBoxCtrl*)ctrl;
+
+        if (!self || !check) return;
+        self->childSetEnabled("xmlrpc_proxy_editor", check->get());
+        self->childSetEnabled("xmlrpc_proxy_port", check->get());
+        self->childSetEnabled("xmlrpc_proxy_text_label", check->get());
+}
\ No newline at end of file