summaryrefslogtreecommitdiff
path: root/indra/newview/llfirstuse.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/llfirstuse.cpp')
-rw-r--r--indra/newview/llfirstuse.cpp58
1 files changed, 25 insertions, 33 deletions
diff --git a/indra/newview/llfirstuse.cpp b/indra/newview/llfirstuse.cpp
index 9391944d3f..e319418def 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)
@@ -145,21 +144,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)));
}
}
@@ -171,6 +162,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