diff options
| author | James Cook <james@lindenlab.com> | 2010-05-13 15:47:32 -0700 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2010-05-13 15:47:32 -0700 |
| commit | 8b524549902b780c2833691368bc35bdb1837cd9 (patch) | |
| tree | b742a7f5463fb42663fa51e1029c80671ceb881b /indra/newview/llnotificationstorage.cpp | |
| parent | 14f423a23c38bf554e9633752074fbcabd92599c (diff) | |
| parent | aebb49520b1919e0ac2bcc7373fc2db031e3b7f0 (diff) | |
merge pull from dessie/viewer-public, picking up SLE code
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; |