- fixed : enabling/disabling RLVa doesn't show the pop-ups as intended

--HG--
branch : RLVa

indra/newview/llviewercontrol.cpp

@@ -75,6 +75,9 @@
 #include "llslurl.h"
 #include "llstartup.h"
 #include "llupdaterservice.h"
+// [RLVa:KB] - Checked: 2015-12-27 (RLVa-1.5.0)
+#include "rlvcommon.h"
+// [/RLVa:KB]
 
 // Third party library includes
 #include <boost/algorithm/string.hpp>
@@ -761,6 +764,9 @@ void settings_setup_listeners()
 	gSavedSettings.getControl("SpellCheck")->getSignal()->connect(boost::bind(&handleSpellCheckChanged));
 	gSavedSettings.getControl("SpellCheckDictionary")->getSignal()->connect(boost::bind(&handleSpellCheckChanged));
 	gSavedSettings.getControl("LoginLocation")->getSignal()->connect(boost::bind(&handleLoginLocationChanged));
+// [RLVa:KB] - Checked: 2015-12-27 (RLVa-1.5.0)
+	gSavedSettings.getControl("RestrainedLove")->getSignal()->connect(boost::bind(&RlvSettings::onChangedSettingMain, _2));
+// [/RLVa:KB]
 }
 
 #if TEST_CACHED_CONTROL

indra/newview/rlvcommon.cpp

@@ -21,6 +21,7 @@
 #include "llinstantmessage.h"
 #include "llnotificationsutil.h"
 #include "llsdserialize.h"
+#include "lltrans.h"
 #include "llviewerparcelmgr.h"
 #include "llviewermenu.h"
 #include "llviewerregion.h"
@@ -78,8 +79,6 @@ void RlvSettings::initClass()
 	static bool fInitialized = false;
 	if (!fInitialized)
 	{
-		gSavedSettings.getControl(RLV_SETTING_MAIN)->getSignal()->connect(boost::bind(&onChangedSettingMain, _2));
-
 		#ifdef RLV_EXPERIMENTAL_COMPOSITEFOLDERS
 		fCompositeFolders = rlvGetSetting<bool>(RLV_SETTING_ENABLECOMPOSITES, false);
 		if (gSavedSettings.controlExists(RLV_SETTING_ENABLECOMPOSITES))
@@ -148,9 +147,9 @@ void RlvSettings::onChangedSettingMain(const LLSD& sdValue)
 	{
 		LLNotificationsUtil::add(
 			"GenericAlert",
-			LLSD().with("MESSAGE", llformat(RlvStrings::getString("message_toggle_restart").c_str(), 
-				(sdValue.asBoolean()) ? RlvStrings::getString("message_toggle_restart_enabled").c_str()
-				                      : RlvStrings::getString("message_toggle_restart_disabled").c_str())));
+			LLSD().with("MESSAGE", llformat(LLTrans::getString("RLVaToggleMessage").c_str(), 
+				(sdValue.asBoolean()) ? LLTrans::getString("RLVaToggleEnabled").c_str()
+				                      : LLTrans::getString("RLVaToggleDisabled").c_str())));
 	}
 }
 
@@ -548,7 +547,7 @@ bool rlvMenuMainToggleVisible(LLUICtrl* pMenuCtrl)
 		if (gSavedSettings.getBOOL(RLV_SETTING_MAIN) == rlv_handler_t::isEnabled())
 			pMenuItem->setLabel(strLabel);
 		else
-			pMenuItem->setLabel(strLabel + RlvStrings::getString("message_toggle_restart_pending"));
+			pMenuItem->setLabel(strLabel + " " + LLTrans::getString("RLVaPendingRestart"));
 	}
 	return true;
 }

indra/newview/rlvcommon.h

@@ -104,10 +104,10 @@ public:
 	#endif // RLV_EXTENSION_STARTLOCATION
 
 	static void initClass();
+	static void onChangedSettingMain(const LLSD& sdValue);
 protected:
 	static bool onChangedMenuLevel();
 	static bool onChangedSettingBOOL(const LLSD& sdValue, bool* pfSetting);
-	static void onChangedSettingMain(const LLSD& sdValue);
 
 	#ifdef RLV_EXPERIMENTAL_COMPOSITEFOLDERS
 	static BOOL fCompositeFolders;

indra/newview/skins/default/xui/en/rlva_strings.xml

@@ -110,28 +110,6 @@
 			<key>customizable</key>
 			<boolean>1</boolean>
 		</map>
-
-		<!-- System messages -->
-		<key>message_toggle_restart</key>
-		<map>
-			<key>value</key>
-			<string>RestrainedLove Support will be %s after you restart</string>
-		</map>
-		<key>message_toggle_restart_pending</key>
-		<map>
-			<key>value</key>
-			<string> (pending restart)</string>
-		</map>
-		<key>message_toggle_restart_enabled</key>
-		<map>
-			<key>value</key>
-			<string>enabled</string>
-		</map>
-		<key>message_toggle_restart_disabled</key>
-		<map>
-			<key>value</key>
-			<string>disabled</string>
-		</map>
 	</map>
 
 	<!-- Generic names used to replace resident names when @shownames restricted -->

indra/newview/skins/default/xui/en/strings.xml

@@ -4086,6 +4086,12 @@ Try enclosing path to the editor with double quotes.
   <!-- Spell check settings floater -->
   <string name="UserDictionary">[User]</string>
   
+  <!-- RLVa -->
+  <string name="RLVaPendingRestart"> (pending restart)</string>
+  <string name="RLVaToggleMessage">RestrainedLove Support will be %s after you restart</string>
+  <string name="RLVaToggleEnabled">enabled</string>
+  <string name="RLVaToggleDisabled">disabled</string>
+   
   <!-- Experience Tools strings -->
   <string name="experience_tools_experience">Experience</string>
   <string name="ExperienceNameNull">(no experience)</string>