diff options
| author | Richard Linden <none@none> | 2012-03-30 18:36:43 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2012-03-30 18:36:43 -0700 |
| commit | c2afd200a0d55c5137de6f89200a8d4b09ba8b6e (patch) | |
| tree | 88d83457bd871c829288d374fbcceb55f8b09308 /indra/newview/llchiclet.cpp | |
| parent | 56f9c54c8348786db395ccd464eec17d5b17eeb1 (diff) | |
CHUI-51 WIP notifications routing code cleanup
object inventory offers don't increment system menu count
added customizable merging behavior for duplicate "unique" notifications
fixed overeager notification channels
Diffstat (limited to 'indra/newview/llchiclet.cpp')
| -rw-r--r-- | indra/newview/llchiclet.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/indra/newview/llchiclet.cpp b/indra/newview/llchiclet.cpp index 67519a3ca6..b4c70b6edb 100644 --- a/indra/newview/llchiclet.cpp +++ b/indra/newview/llchiclet.cpp @@ -393,9 +393,15 @@ void LLNotificationChiclet::setCounter(S32 counter) } -bool LLNotificationChiclet::ChicletNotificationChannel::filterNotification( LLNotificationPtr notify ) +bool LLNotificationChiclet::ChicletNotificationChannel::filterNotification( LLNotificationPtr notification ) { - return !(notify->canLogToIM() && notify->hasFormElements()); + if( !(notification->canLogToIM() && notification->hasFormElements()) + && (!notification->getPayload().has("give_inventory_notification") + || notification->getPayload()["give_inventory_notification"])) + { + return true; + } + return false; } ////////////////////////////////////////////////////////////////////////// |