From 669c34894ada93db64e05b4a887b15efe990c81f Mon Sep 17 00:00:00 2001 From: Armin Weatherwax Date: Fri, 5 Feb 2010 14:05:56 +0100 Subject: Ignore HideFromEditor from settings.xml. Don't hide any settings from Debug Settings. --- ChangeLog.txt | 8 ++++++++ linden/indra/llxml/llcontrol.cpp | 15 ++++++++++++++- 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index 827ab39..c4bb418 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -207,6 +207,14 @@ modified: linden/indra/newview/skins/default/xui/en-us/panel_login.xml +2010-02-05 Armin Weatherwax + + * Ignore HideFromEditor from settings.xml. + Don't hide any settings from Debug Settings. + + modified: linden/indra/llxml/llcontrol.cpp + + 2010-02-04 Jacek Antonelli * Added SliderScrollWheelMultiplier setting. diff --git a/linden/indra/llxml/llcontrol.cpp b/linden/indra/llxml/llcontrol.cpp index 8bd04d7..88eb2c3 100644 --- a/linden/indra/llxml/llcontrol.cpp +++ b/linden/indra/llxml/llcontrol.cpp @@ -216,7 +216,8 @@ void LLControlVariable::setPersist(bool state) void LLControlVariable::setHiddenFromSettingsEditor(bool hide) { - mHideFromSettingsEditor = hide; + // mHideFromSettingsEditor = hide; //no, not really + mHideFromSettingsEditor = false; } void LLControlVariable::setComment(const std::string& comment) @@ -1077,6 +1078,17 @@ U32 LLControlGroup::loadFromFile(const std::string& filename, bool set_default_v // Sometimes we want to use the settings system to provide cheap persistence, but we // don't want the settings themselves to be easily manipulated in the UI because // doing so can cause support problems. So we have this option: + + // To actually only hide adult settings and the world search url. + // Upside of the latter is that it also makes it harder to use the viewer with OpenSim. + // And teenagers never would dare ever to touch the settings.xml file. + // + // For it's anyway useful to be able to change them we should add in future + // a possibility to unhide them again, e.g. typing "I'm up to no good" to channel 666, + // tripple-rightclick the avatars nose and then play a "I will tell your MUM that you + // changed ADULT setting in the DEBUG MENU!" gesture in world. + // +/* if(control_map.has("HideFromEditor")) { hidefromsettingseditor = control_map["HideFromEditor"].asInteger(); @@ -1085,6 +1097,7 @@ U32 LLControlGroup::loadFromFile(const std::string& filename, bool set_default_v { hidefromsettingseditor = false; } +*/ // If the control exists just set the value from the input file. LLControlVariable* existing_control = getControl(name); -- cgit v1.1