Merged in backout of setSetting listener.

indra/newview/llappviewerlistener.cpp

@@ -18,7 +18,6 @@
 // external library headers
 // other Linden headers
 #include "llappviewer.h"
-#include "llviewercontrol.h"
 
 LLAppViewerListener::LLAppViewerListener(const std::string& pumpname, LLAppViewer* llappviewer):
     LLDispatchListener(pumpname, "op"),
@@ -26,21 +25,9 @@ LLAppViewerListener::LLAppViewerListener(const std::string& pumpname, LLAppViewe
 {
     // add() every method we want to be able to invoke via this event API.
     add("requestQuit", &LLAppViewerListener::requestQuit);
-    add("setSetting", &LLAppViewerListener::setSetting);
 }
 
 void LLAppViewerListener::requestQuit(const LLSD& event) const
 {
     mAppViewer->requestQuit();
 }
-
-void LLAppViewerListener::setSetting(const LLSD & event) const
-{
-	std::string control_name = event["name"].asString();
-	if (gSavedSettings.controlExists(control_name))
-	{
-		LLControlVariable* control = gSavedSettings.getControl(control_name);
-
-		control->set(event["value"]);
-	}
-}

indra/newview/llappviewerlistener.h

@@ -27,7 +27,6 @@ class LLAppViewerListener: public LLDispatchListener
 
 private:
     void requestQuit(const LLSD& event) const;
-    void setSetting(const LLSD & event) const;
 
     LLAppViewer* mAppViewer;
 };