Applied RLVa-1.1.2-Imprudence.patch by Kitty Barnett

1 files changed, 0 insertions, 20 deletions

diff --git a/linden/indra/newview/llviewercontrol.cpp b/linden/indra/newview/llviewercontrol.cpp
index 50224ad..88ea904 100644
--- a/linden/indra/newview/llviewercontrol.cpp
+++ b/linden/indra/newview/llviewercontrol.cpp
@@ -520,19 +520,6 @@ bool handleSliderScrollWheelMultiplierChanged(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]
 
 ////////////////////////////////////////////////////////////////////////////
 
@@ -677,13 +664,6 @@ void settings_setup_listeners()
         gSavedSettings.getControl("MediaDebugLevel")->getSignal()->connect(boost::bind(&handleMediaDebugLevelChanged, _1));     
         gSavedSettings.getControl("SliderScrollWheelMultiplier")->getSignal()->connect(boost::bind(&handleSliderScrollWheelMultiplierChanged, _1));     
         gSavedSettings.getControl("TranslateChat")->getSignal()->connect(boost::bind(&handleTranslateChatPrefsChanged, _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)