diff options
| author | Richard Linden <none@none> | 2012-05-18 13:20:32 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2012-05-18 13:20:32 -0700 |
| commit | 296e55c1b323c05b6544b69ace04afe19102396b (patch) | |
| tree | a0d3a495061442b2adfb4342c5c490c039526489 /indra/llui/llnotificationtemplate.h | |
| parent | cf86247b8c5e199447b7cd3dc645a42a6a645265 (diff) | |
CHUI-112 FIX Clicking Show or Discard in an inventory offer toast does not dismiss toast
removed special case logic for dealing with user online/offline collisions
added ability to cancel old duplicate notifications
Diffstat (limited to 'indra/llui/llnotificationtemplate.h')
| -rw-r--r-- | indra/llui/llnotificationtemplate.h | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/indra/llui/llnotificationtemplate.h b/indra/llui/llnotificationtemplate.h index f7d08ae1f4..ca9c4294c1 100644 --- a/indra/llui/llnotificationtemplate.h +++ b/indra/llui/llnotificationtemplate.h @@ -66,8 +66,9 @@ struct LLNotificationTemplate { static void declareValues() { - declare("newest", LLNotification::USE_NEWEST); - declare("oldest", LLNotification::USE_OLDEST); + declare("replace_with_new", LLNotification::REPLACE_WITH_NEW); + declare("keep_old", LLNotification::KEEP_OLD); + declare("cancel_old", LLNotification::CANCEL_OLD); } }; @@ -109,7 +110,7 @@ struct LLNotificationTemplate UniquenessConstraint() : contexts("context"), - combine("combine", LLNotification::USE_NEWEST), + combine("combine", LLNotification::REPLACE_WITH_NEW), dummy_val("") {} }; @@ -185,6 +186,7 @@ struct LLNotificationTemplate Mandatory<std::string> name; Optional<bool> persist, log_to_im, + show_toast, log_to_chat; Optional<std::string> functor, icon, @@ -206,6 +208,7 @@ struct LLNotificationTemplate : name("name"), persist("persist", false), log_to_im("log_to_im", false), + show_toast("show_toast", true), log_to_chat("log_to_chat", true), functor("functor"), icon("icon"), @@ -313,6 +316,7 @@ struct LLNotificationTemplate // inject these notifications into chat/IM streams bool mLogToChat; bool mLogToIM; + bool mShowToast; }; #endif //LL_LLNOTIFICATION_TEMPLATE_H |