diff options
| author | simon <none@none> | 2013-08-26 15:45:09 -0700 |
|---|---|---|
| committer | simon <none@none> | 2013-08-26 15:45:09 -0700 |
| commit | 90d1c5b3676fe4e8ea8668b41fdf92613d5f102d (patch) | |
| tree | 8d5afd9678fd44444bcc7b5d311b5cfb7abe5217 /indra/llui/llnotifications.cpp | |
| parent | ac2dc34ed0abbac8d5a8eb7f887037fe387c6a7a (diff) | |
| parent | 27d637d0f14fdfff496256222dc1343d2d7ee9ae (diff) | |
Merge downstream code for CHUIStorm
Diffstat (limited to 'indra/llui/llnotifications.cpp')
| -rwxr-xr-x | indra/llui/llnotifications.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/indra/llui/llnotifications.cpp b/indra/llui/llnotifications.cpp index 1789f003b9..3186c5460a 100755 --- a/indra/llui/llnotifications.cpp +++ b/indra/llui/llnotifications.cpp @@ -214,7 +214,7 @@ LLNotificationForm::LLNotificationForm(const std::string& name, const LLNotifica } else { - LLUI::sSettingGroups["ignores"]->declareBOOL(name, show_notification, "Show notification with this name", TRUE); + LLUI::sSettingGroups["ignores"]->declareBOOL(name, show_notification, "Show notification with this name", LLControlVariable::PERSIST_NONDFT); mIgnoreSetting = LLUI::sSettingGroups["ignores"]->getControl(name); } } @@ -1125,7 +1125,7 @@ LLNotificationChannel::LLNotificationChannel(const Params& p) mName(p.name.isProvided() ? p.name : LLUUID::generateNewID().asString()) { BOOST_FOREACH(const std::string& source, p.sources) -{ + { connectToChannel(source); } } @@ -1209,6 +1209,10 @@ LLNotifications::LLNotifications() LLUICtrl::CommitCallbackRegistry::currentRegistrar().add("Notification.Show", boost::bind(&LLNotifications::addFromCallback, this, _2)); } +void LLNotifications::clear() +{ + mDefaultChannels.clear(); +} // The expiration channel gets all notifications that are cancelled bool LLNotifications::expirationFilter(LLNotificationPtr pNotification) |