RLVa 1.1.2 to 1.1.3 upgrade. InvLinks + COF

This commit is contained in:
Siana Gearz
2010-11-25 23:47:11 +01:00
parent 074bec3ad1
commit f9dcb1bb09
88 changed files with 8710 additions and 4707 deletions

View File

@@ -1159,15 +1159,6 @@ 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)