diff options
| author | Alexei Arabadji <aarabadji@productengine.com> | 2010-05-12 14:10:44 +0300 |
|---|---|---|
| committer | Alexei Arabadji <aarabadji@productengine.com> | 2010-05-12 14:10:44 +0300 |
| commit | fbaae0a2df3b68756c7d910438041887d018cd63 (patch) | |
| tree | aceb50a59cb304de950abfb7dc7f0060b8f7bb94 /indra/newview/llnotificationstorage.cpp | |
| parent | 36e84baea4510369e1f947c46368d93995a1f9fb (diff) | |
| parent | 367b77eb1b87ba55fd4a94e9b2630a7d002d4399 (diff) | |
Automated merge with https://hg.productengine.com/secondlife/viewer-trunk/
--HG--
branch : product-engine
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; |