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/llscreenchannel.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/llscreenchannel.cpp')
| -rw-r--r-- | indra/newview/llscreenchannel.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/indra/newview/llscreenchannel.cpp b/indra/newview/llscreenchannel.cpp index 5301955964..cc68c4c91a 100644 --- a/indra/newview/llscreenchannel.cpp +++ b/indra/newview/llscreenchannel.cpp @@ -251,7 +251,14 @@ void LLScreenChannel::addToast(const LLToast::Params& p) { bool store_toast = false, show_toast = false; - mDisplayToastsAlways ? show_toast = true : show_toast = mWasStartUpToastShown && (mShowToasts || p.force_show); + if (mDisplayToastsAlways) + { + show_toast = true; + } + else + { + show_toast = mWasStartUpToastShown && (mShowToasts || p.force_show); + } store_toast = !show_toast && p.can_be_stored && mCanStoreToasts; if(!show_toast && !store_toast) |