diff options
| author | Oz Linden <oz@lindenlab.com> | 2016-03-23 11:50:39 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2016-03-23 11:50:39 -0400 |
| commit | 518f92126f18d5f4b8ee8eb287500fe5a7e17c99 (patch) | |
| tree | 5d58fc3ba9ec7e0f6097b0644ec65fbbebd9cfbc /indra/newview | |
| parent | 7bbf2ec9f82c9818d02493c7b877e68ca97261fc (diff) | |
improve settings error log, and make type conversion methods static
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llpresetsmanager.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/llviewercontrollistener.cpp | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/llpresetsmanager.cpp b/indra/newview/llpresetsmanager.cpp index 152001eb46..d95546f11d 100644 --- a/indra/newview/llpresetsmanager.cpp +++ b/indra/newview/llpresetsmanager.cpp @@ -180,7 +180,7 @@ bool LLPresetsManager::savePreset(const std::string& subdirectory, std::string n std::string ctrl_name = *it; LLControlVariable* ctrl = gSavedSettings.getControl(ctrl_name).get(); std::string comment = ctrl->getComment(); - std::string type = gSavedSettings.typeEnumToString(ctrl->type()); + std::string type = LLControlGroup::typeEnumToString(ctrl->type()); LLSD value = ctrl->getValue(); paramsData[ctrl_name]["Comment"] = comment; diff --git a/indra/newview/llviewercontrollistener.cpp b/indra/newview/llviewercontrollistener.cpp index 361b96221c..d2484b2b23 100644 --- a/indra/newview/llviewercontrollistener.cpp +++ b/indra/newview/llviewercontrollistener.cpp @@ -121,7 +121,7 @@ struct Info if (control) { response["name"] = control->getName(); - response["type"] = group->typeEnumToString(control->type()); + response["type"] = LLControlGroup::typeEnumToString(control->type()); response["value"] = control->get(); response["comment"] = control->getComment(); } @@ -167,7 +167,7 @@ void LLViewerControlListener::toggle(LLSD const & request) info.response.error(STRINGIZE("toggle of non-boolean '" << info.groupname << "' control '" << info.key << "', type is " - << info.group->typeEnumToString(info.control->type()))); + << LLControlGroup::typeEnumToString(info.control->type()))); } } @@ -199,7 +199,7 @@ struct CollectVars: public LLControlGroup::ApplyFunctor { vars.append(LLSDMap ("name", name) - ("type", mGroup->typeEnumToString(control->type())) + ("type", LLControlGroup::typeEnumToString(control->type())) ("value", control->get()) ("comment", control->getComment())); } |