2 files changed, 95 insertions, 0 deletions

diff --git a/linden/indra/llxml/llcontrol.cpp b/linden/indra/llxml/llcontrol.cpp
index 88eb2c3..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)
@@ -1217,6 +1226,12 @@ void LLControlGroup::resetWarnings()
         }
 }
 
+template <>                                     void jc_rebind::rebind_callback<S32>(const LLSD &data, S32 *reciever){ *reciever = data.asInteger(); }
+template <>                                     void jc_rebind::rebind_callback<F32>(const LLSD &data, F32 *reciever){ *reciever = data.asReal(); }
+template <>                                     void jc_rebind::rebind_callback<U32>(const LLSD &data, U32 *reciever){ *reciever = data.asInteger(); }
+template <>                                     void jc_rebind::rebind_callback<std::string>(const LLSD &data, std::string *reciever){ *reciever = data.asString(); }
+template <>                                     void jc_rebind::rebind_callback<LLColor4>(const LLSD &data, LLColor4 *reciever){ *reciever = LLColor4(LLColor4U(data)); }
+
 //============================================================================
 
 #ifdef TEST_HARNESS
diff --git a/linden/indra/llxml/llcontrol.h b/linden/indra/llxml/llcontrol.h
index ba0a1c7..316de5c 100644
--- a/linden/indra/llxml/llcontrol.h
+++ b/linden/indra/llxml/llcontrol.h
@@ -242,4 +242,84 @@ public:
         void resetWarnings();
 };
 
+///////////////////////
+namespace jc_you_suck
+{
+class jc_rebind
+{
+        template <typename REC>         static void rebind_callback(const LLSD &data, REC *reciever){ *reciever = data; }
+
+        typedef boost::signal<void(const LLSD&)> signal_t;
+
+public:
+
+//#define binder_debug
+
+        template <typename RBTYPE> static RBTYPE* rebind_llcontrol(std::string name, LLControlGroup* controlgroup, bool init)
+        {
+                static std::map<LLControlGroup*, std::map<std::string, void*> > references;
+
+#ifdef binder_debug
+                llinfos << "rebind_llcontrol" << llendl;
+#endif
+
+                RBTYPE* type = NULL;
+                if(controlgroup)
+                {
+                        if(references.find(controlgroup) == references.end())
+                        {
+#ifdef binder_debug
+                                llinfos << "was no map for a group, adding" << llendl;
+#endif
+                                references[controlgroup] = std::map<std::string, void*>();
+                        }
+
+                        if(references[controlgroup].find(name) != references[controlgroup].end())
+                        {
+#ifdef binder_debug
+                                llinfos << "pulling type from map for " << name << llendl;
+#endif
+                                type = (RBTYPE*)(references[controlgroup][name]);
+                                if(type == NULL)llerrs << "bad type stored" << llendl;
+                        }else
+                        {
+#ifdef binder_debug
+                                llinfos << "creating type in map for " << name << llendl;
+#endif
+                                type = new RBTYPE();
+                                references[controlgroup][name] = (void*)type;
+                                LLControlVariable* control = controlgroup->getControl(name);
+                                if(control)
+                                {
+#ifdef binder_debug
+                                        llinfos << "control there " << name << llendl;
+#endif
+                                        signal_t* signal = control->getSignal();
+                                        if(signal)
+                                        {
+#ifdef binder_debug
+                                                llinfos << "signal there" << name << llendl;
+#endif
+                                                signal->connect(boost::bind(&jc_rebind::rebind_callback<RBTYPE>, _1, type));
+                                                if(init)jc_rebind::rebind_callback<RBTYPE>(control->getValue(),type);
+                                        }else llerrs << "no signal!" << llendl;
+                                }else llerrs << "no control for " << name << "!" << llendl;
+                        }
+                }
+                return type;
+        }
+};
+
+template <>                                     void jc_rebind::rebind_callback<S32>(const LLSD &data, S32 *reciever);
+template <>                                     void jc_rebind::rebind_callback<F32>(const LLSD &data, F32 *reciever);
+template <>                                     void jc_rebind::rebind_callback<U32>(const LLSD &data, U32 *reciever);
+template <>                                     void jc_rebind::rebind_callback<std::string>(const LLSD &data, std::string *reciever);
+template <>                                     void jc_rebind::rebind_callback<LLColor4>(const LLSD &data, LLColor4 *reciever);
+
+}
+using namespace jc_you_suck;
+#define rebind_llcontrol jc_rebind::rebind_llcontrol
+
+///////////////////////
+
 #endif