diff options
| author | Aleric Inglewood | 2010-10-22 00:51:53 +0200 |
|---|---|---|
| committer | Aleric Inglewood | 2010-10-22 00:51:53 +0200 |
| commit | 7c4e01af677907b75694b9c4827d6f3ba56a5e19 (patch) | |
| tree | fd743d3cefc7d4e671c6a6429be50e76191bbd9c /linden/indra/llxml | |
| parent | Don't dump callstacks at clean exit of viewer. (diff) | |
| parent | Changed version to Experimental 2010.10.17 (diff) | |
| download | meta-impy-7c4e01af677907b75694b9c4827d6f3ba56a5e19.zip meta-impy-7c4e01af677907b75694b9c4827d6f3ba56a5e19.tar.gz meta-impy-7c4e01af677907b75694b9c4827d6f3ba56a5e19.tar.bz2 meta-impy-7c4e01af677907b75694b9c4827d6f3ba56a5e19.tar.xz | |
Merge branch 'weekly' of http://github.com/imprudence/imprudence into weekly
Diffstat (limited to 'linden/indra/llxml')
| -rw-r--r-- | linden/indra/llxml/llcontrol.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/linden/indra/llxml/llcontrol.cpp b/linden/indra/llxml/llcontrol.cpp index 1d1f024..452167e 100644 --- a/linden/indra/llxml/llcontrol.cpp +++ b/linden/indra/llxml/llcontrol.cpp | |||
| @@ -1099,6 +1099,15 @@ U32 LLControlGroup::loadFromFile(const std::string& filename, bool set_default_v | |||
| 1099 | } | 1099 | } |
| 1100 | */ | 1100 | */ |
| 1101 | 1101 | ||
| 1102 | // [RLVa:KB] - Checked: 2010-06-20 (RLVa-1.1.2a) | Added: RLVa-1.1.2a | ||
| 1103 | // HACK-RLVa: bad code but it's just a temporary measure to provide a smooth changeover from the old to the new rebranded settings | ||
| 1104 | if ( (name.length() >= 14) && (0 == name.find("RestrainedLife")) ) | ||
| 1105 | { | ||
| 1106 | // Transparently convert the old settings name to the new one while preserving the user override | ||
| 1107 | name = "RestrainedLove" + name.substr(14); | ||
| 1108 | } | ||
| 1109 | // [/RLVa:KB] | ||
| 1110 | |||
| 1102 | // If the control exists just set the value from the input file. | 1111 | // If the control exists just set the value from the input file. |
| 1103 | LLControlVariable* existing_control = getControl(name); | 1112 | LLControlVariable* existing_control = getControl(name); |
| 1104 | if(existing_control) | 1113 | if(existing_control) |