merge changes for storm-1077

1 files changed, 25 insertions, 40 deletions

diff --git a/indra/newview/llfirstuse.cpp b/indra/newview/llfirstuse.cpp
index dd6d7f1b33..d63685e1af 100644
--- a/indra/newview/llfirstuse.cpp
+++ b/indra/newview/llfirstuse.cpp
@@ -41,36 +41,35 @@
 
 
 // static
-//std::set<std::string> LLFirstUse::sConfigVariables;
-std::set<std::string> LLFirstUse::sConfigVariablesEnabled;
+std::set<std::string> LLFirstUse::sConfigVariables;
 
 // static
-//void LLFirstUse::addConfigVariable(const std::string& var)
-//{
-//	sConfigVariables.insert(var);
-//}
+void LLFirstUse::addConfigVariable(const std::string& var)
+{
+	sConfigVariables.insert(var);
+}
 
 // static
-//void LLFirstUse::disableFirstUse()
-//{
-//	// Set all first-use warnings to disabled
-//	for (std::set<std::string>::iterator iter = sConfigVariables.begin();
-//		 iter != sConfigVariables.end(); ++iter)
-//	{
-//		gWarningSettings.setBOOL(*iter, FALSE);
-//	}
-//}
+void LLFirstUse::disableFirstUse()
+{
+	// Set all first-use warnings to disabled
+	for (std::set<std::string>::iterator iter = sConfigVariables.begin();
+		 iter != sConfigVariables.end(); ++iter)
+	{
+		gWarningSettings.setBOOL(*iter, FALSE);
+	}
+}
 
 // static
-//void LLFirstUse::resetFirstUse()
-//{
-//	// Set all first-use warnings to disabled
-//	for (std::set<std::string>::iterator iter = sConfigVariables.begin();
-//		 iter != sConfigVariables.end(); ++iter)
-//	{
-//		gWarningSettings.setBOOL(*iter, TRUE);
-//	}
-//}
+void LLFirstUse::resetFirstUse()
+{
+	// Set all first-use warnings to disabled
+	for (std::set<std::string>::iterator iter = sConfigVariables.begin();
+		 iter != sConfigVariables.end(); ++iter)
+	{
+		gWarningSettings.setBOOL(*iter, TRUE);
+	}
+}
 
 // static
 void LLFirstUse::otherAvatarChatFirst(bool enable)
@@ -110,13 +109,6 @@ void LLFirstUse::notUsingDestinationGuide(bool enable)
 	firstUseNotification("FirstNotUseDestinationGuide", enable, "HintDestinationGuide", LLSD(), LLSD().with("target", "dest_guide_btn").with("direction", "top"));
 }
 
-void LLFirstUse::notUsingAvatarPicker(bool enable)
-{
-	// not doing this yet
-	firstUseNotification("FirstNotUseAvatarPicker", enable, "HintAvatarPicker", LLSD(), LLSD().with("target", "avatar_picker_btn").with("direction", "top"));
-}
-
-
 // static
 void LLFirstUse::notUsingSidePanel(bool enable)
 {
@@ -158,21 +150,13 @@ void LLFirstUse::firstUseNotification(const std::string& control_var, bool enabl
 
 	if (enable)
 	{
-		if(sConfigVariablesEnabled.find(control_var) != sConfigVariablesEnabled.end())
-		{
-			return ; //already added
-		}
-
 		if (gSavedSettings.getBOOL("EnableUIHints"))
 		{
 			LL_DEBUGS("LLFirstUse") << "Trigger first use notification " << notification_name << LL_ENDL;
 
 			// if notification doesn't already exist and this notification hasn't been disabled...
 			if (gWarningSettings.getBOOL(control_var))
-			{ 
-				sConfigVariablesEnabled.insert(control_var) ;
-
-				// create new notification
+			{ // create new notification
 				LLNotifications::instance().add(LLNotification::Params().name(notification_name).substitutions(args).payload(payload.with("control_var", control_var)));
 			}
 		}
@@ -184,6 +168,7 @@ void LLFirstUse::firstUseNotification(const std::string& control_var, bool enabl
 		// redundantly clear settings var here, in case there are no notifications to cancel
 		gWarningSettings.setBOOL(control_var, FALSE);
 	}
+
 }
 
 // static