Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merged in RLVa. Viewer broken!

Browse Source
This commit is contained in:
Siana Gearz
2010-11-07 05:05:47 +01:00
parent ae4a9521af
commit 740b570168
94 changed files with 11249 additions and 503 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
indra/llxml/llcontrol.cpp
View File

@@ -1106,6 +1106,15 @@ U32 LLControlGroup::loadFromFile(const std::string& filename, bool set_default_v
hidefromsettingseditor = false;
}
// [RLVa:KB] - Checked: 2010-06-20 (RLVa-1.1.2a) | Added: RLVa-1.1.2a
// HACK-RLVa: bad code but it's just a temporary measure to provide a smooth changeover from the old to the new rebranded settings
if ( (name.length() >= 14) && (0 == name.find("RestrainedLife")) )
{
// Transparently convert the old settings name to the new one while preserving the user override
name = "RestrainedLove" + name.substr(14);
}
// [/RLVa:KB]
// If the control exists just set the value from the input file.
LLControlVariable* existing_control = getControl(name);
if(existing_control)