diff options
| -rw-r--r-- | indra/llxml/llcontrol.h | 2 | ||||
| -rw-r--r-- | indra/newview/llappviewerlistener.cpp | 9 | ||||
| -rw-r--r-- | indra/newview/llappviewerlistener.h | 1 | ||||
| -rw-r--r-- | indra/newview/llviewercontrollistener.cpp | 6 | ||||
| -rw-r--r-- | indra/newview/scripts/lua/LLDebugSettings.lua | 8 |
5 files changed, 11 insertions, 15 deletions
diff --git a/indra/llxml/llcontrol.h b/indra/llxml/llcontrol.h index 7e79e2f31e..5a8d688892 100644 --- a/indra/llxml/llcontrol.h +++ b/indra/llxml/llcontrol.h @@ -143,7 +143,7 @@ public: LLSD getDefault() const { return mValues.front(); } LLSD getSaveValue() const; - void set(const LLSD& val) { setValue(val); } + void set(const LLSD& val, bool saved_value = true) { setValue(val, saved_value); } void setValue(const LLSD& value, bool saved_value = TRUE); void setDefaultValue(const LLSD& value); void setPersist(ePersist); diff --git a/indra/newview/llappviewerlistener.cpp b/indra/newview/llappviewerlistener.cpp index 35732d8949..bd0c6955b1 100644 --- a/indra/newview/llappviewerlistener.cpp +++ b/indra/newview/llappviewerlistener.cpp @@ -53,10 +53,6 @@ LLAppViewerListener::LLAppViewerListener(const LLAppViewerGetter& getter): add("setDebugSetting", "Apply specified [\"value\"] to the debug [\"setting\"] (this change won't persist across sessions)", &LLAppViewerListener::setDebugSetting, llsd::map("setting", LLSD(), "value", LLSD())); - - add("getDebugSetting", - "Return the value of specified debug [\"setting\"]", - &LLAppViewerListener::getDebugSetting, llsd::map("setting", LLSD(), "reply", LLSD())); } void LLAppViewerListener::requestQuit(const LLSD& event) @@ -79,8 +75,3 @@ void LLAppViewerListener::setDebugSetting(const LLSD &event) //don't save this change between sesssions gSavedSettings.setUntypedValue(setting_name, value, false); } - -void LLAppViewerListener::getDebugSetting(const LLSD &event) -{ - Response response(llsd::map("value", gSavedSettings.getLLSD(event["setting"])), event); -} diff --git a/indra/newview/llappviewerlistener.h b/indra/newview/llappviewerlistener.h index 897e4105ac..8b38636bd1 100644 --- a/indra/newview/llappviewerlistener.h +++ b/indra/newview/llappviewerlistener.h @@ -48,7 +48,6 @@ private: void forceQuit(const LLSD& event); void setDebugSetting(const LLSD &event); - void getDebugSetting(const LLSD &event); LLAppViewerGetter mAppViewerGetter; }; diff --git a/indra/newview/llviewercontrollistener.cpp b/indra/newview/llviewercontrollistener.cpp index 8820f9ec56..5c1b020c9d 100644 --- a/indra/newview/llviewercontrollistener.cpp +++ b/indra/newview/llviewercontrollistener.cpp @@ -141,7 +141,8 @@ void LLViewerControlListener::set(LLSD const & request) if (request.has("value")) { - info.control->setValue(request["value"]); + LL_WARNS("LLViewerControlListener") << "Changing debug setting " << std::quoted(info.key) << " to " << request["value"] << LL_ENDL; + info.control->setValue(request["value"], false); } else { @@ -158,7 +159,8 @@ void LLViewerControlListener::toggle(LLSD const & request) if (info.control->isType(TYPE_BOOLEAN)) { - info.control->set(! info.control->get().asBoolean()); + LL_WARNS("LLViewerControlListener") << "Toggling debug setting " << std::quoted(info.key) << LL_ENDL; + info.control->set(! info.control->get().asBoolean(), false); } else { diff --git a/indra/newview/scripts/lua/LLDebugSettings.lua b/indra/newview/scripts/lua/LLDebugSettings.lua index 71a12a2ca2..80ae7e87bb 100644 --- a/indra/newview/scripts/lua/LLDebugSettings.lua +++ b/indra/newview/scripts/lua/LLDebugSettings.lua @@ -3,11 +3,15 @@ leap = require 'leap' local LLDebugSettings = {} function LLDebugSettings.set(name, value) - leap.send('LLAppViewer', {op='setDebugSetting', setting=name, value=value}) + return leap.request('LLViewerControl', {op='set', group='Global', key=name, value=value}) +end + +function LLDebugSettings.toggle(name) + return leap.request('LLViewerControl', {op='toggle', group='Global', key=name}) end function LLDebugSettings.get(name) - return leap.request('LLAppViewer', {op='getDebugSetting', setting=name})['value'] + return leap.request('LLViewerControl', {op='get', group='Global', key=name})['value'] end return LLDebugSettings |