diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-05-12 16:46:58 -0400 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-05-12 16:46:58 -0400 |
| commit | 86f6827bf9073fbe533b63a8894d6a49824411a3 (patch) | |
| tree | 2dc6aaece6ecc845b2bf375f148713e28da0660d /indra/newview/llnotificationstorage.cpp | |
| parent | ee53b612fb44b158c10fd949f223f80905a37ce4 (diff) | |
| parent | 265391fb3f88a97c5af868f3712bb7b06ad630c1 (diff) | |
automated merge
Diffstat (limited to 'indra/newview/llnotificationstorage.cpp')
| -rw-r--r-- | indra/newview/llnotificationstorage.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/indra/newview/llnotificationstorage.cpp b/indra/newview/llnotificationstorage.cpp index 316ff4324c..20b40b4e1d 100644 --- a/indra/newview/llnotificationstorage.cpp +++ b/indra/newview/llnotificationstorage.cpp @@ -112,8 +112,8 @@ void LLPersistentNotificationStorage::saveNotifications() LLNotificationPtr notification = *it; // After a notification was placed in Persist channel, it can become - // responded, expired - in this case we are should not save it - if(notification->isRespondedTo() + // responded, expired or canceled - in this case we are should not save it + if(notification->isRespondedTo() || notification->isCancelled() || notification->isExpired()) { continue; @@ -208,7 +208,6 @@ LLNotificationResponderInterface* LLResponderRegistry::createResponder(const std build_map_t::const_iterator it = sBuildMap.find(notification_name); if(sBuildMap.end() == it) { - llwarns << "Responder for notification \'" << notification_name << "\' is not registered" << llendl; return NULL; } responder_constructor_t ctr = it->second; |