From 1866bc2af39189c17b636970d4df7edc983c1830 Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Sat, 9 Oct 2010 03:27:47 -0700
Subject: Applied RLVa-1.1.2-Imprudence.patch by Kitty Barnett
---
linden/indra/llxml/llcontrol.cpp | 9 +++++++++
1 file changed, 9 insertions(+)
(limited to 'linden/indra/llxml')
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
}
*/
+// [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)
--
cgit v1.1