summaryrefslogtreecommitdiff
path: root/indra/newview/llnotificationstorage.cpp
diff options
context:
space:
mode:
authorAlexei Arabadji <aarabadji@productengine.com>2010-05-12 14:10:26 +0300
committerAlexei Arabadji <aarabadji@productengine.com>2010-05-12 14:10:26 +0300
commit367b77eb1b87ba55fd4a94e9b2630a7d002d4399 (patch)
tree6d4fcfeb2fcd5ffcf0f5f291160e04f3f1c3e338 /indra/newview/llnotificationstorage.cpp
parent9ab4d2ca8be2edcafa6cdfc3bd774ebaed444dc8 (diff)
EXT-6783 FIXED Made notifications that are saved into notification well window be persisted and offer notifications non-persisted.
reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/368/ --HG-- branch : product-engine
Diffstat (limited to 'indra/newview/llnotificationstorage.cpp')
-rw-r--r--indra/newview/llnotificationstorage.cpp5
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;