1 files changed, 21 insertions, 0 deletions

diff --git a/linden/indra/newview/llviewercontrol.cpp b/linden/indra/newview/llviewercontrol.cpp
index a81def7..b9db346 100644
--- a/linden/indra/newview/llviewercontrol.cpp
+++ b/linden/indra/newview/llviewercontrol.cpp
@@ -432,6 +432,20 @@ bool handleVoiceClientPrefsChanged(const LLSD& newvalue)
         return true;
 }
 
+// [RLVa:KB] - Checked: 2009-08-11 (RLVa-1.0.1h) | Added: RLVa-1.0.1h
+bool rlvHandleEnableLegacyNamingChanged(const LLSD& newvalue)
+{
+        rlv_handler_t::fLegacyNaming = newvalue.asBoolean();
+        return true;
+}
+
+bool rlvHandleShowNameTagsChanged(const LLSD& newvalue)
+{
+        RlvSettings::fShowNameTags = newvalue.asBoolean();
+        return true;
+}
+// [/RLVa:KB]
+
 bool handleMediaDebugLevelChanged(const LLSD& newvalue)
 {
         LLMediaManager *mgr = LLMediaManager::getInstance();
@@ -578,6 +592,13 @@ void settings_setup_listeners()
         gSavedSettings.getControl("AudioLevelMic")->getSignal()->connect(boost::bind(&handleVoiceClientPrefsChanged, _1));
         gSavedSettings.getControl("LipSyncEnabled")->getSignal()->connect(boost::bind(&handleVoiceClientPrefsChanged, _1));     
         gSavedSettings.getControl("MediaDebugLevel")->getSignal()->connect(boost::bind(&handleMediaDebugLevelChanged, _1));     
+
+// [RLVa:KB] - Checked: 2009-08-11 (RLVa-1.0.1h) | Added: RLVa-1.0.1h
+        if (gSavedSettings.controlExists(RLV_SETTING_ENABLELEGACYNAMING))
+                gSavedSettings.getControl(RLV_SETTING_ENABLELEGACYNAMING)->getSignal()->connect(boost::bind(&rlvHandleEnableLegacyNamingChanged, _1));
+        if (gSavedSettings.controlExists(RLV_SETTING_SHOWNAMETAGS))
+                gSavedSettings.getControl(RLV_SETTING_SHOWNAMETAGS)->getSignal()->connect(boost::bind(&rlvHandleShowNameTagsChanged, _1));
+// [/RLVa:KB]
 }
 
 template <> eControlType get_control_type<U32>(const U32& in, LLSD& out)