diff options
| author | simon <none@none> | 2013-03-25 12:19:02 -0700 |
|---|---|---|
| committer | simon <none@none> | 2013-03-25 12:19:02 -0700 |
| commit | a976f5c217ce97c70a7e151b9a490e6a6ebf1396 (patch) | |
| tree | 8d86c9060ac05b34b1a9dfd25f03451e18dcc326 /indra/newview/llchathistory.h | |
| parent | cc260a635674c56d8fab88a5cd4dd188b4c9ac9c (diff) | |
| parent | 98a82c50d539451e1931826ca75fbc01d611806d (diff) | |
Pull and merge downstream code with CHUI viewer-development by way of viewer-lion
Diffstat (limited to 'indra/newview/llchathistory.h')
| -rw-r--r-- | indra/newview/llchathistory.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/indra/newview/llchathistory.h b/indra/newview/llchathistory.h index 28344e6a10..bb6d4fb59c 100644 --- a/indra/newview/llchathistory.h +++ b/indra/newview/llchathistory.h @@ -60,6 +60,8 @@ class LLChatHistory : public LLUICtrl Optional<LLTextBox::Params> more_chat_text; + Optional<bool> notify_unread_msg; + Params() : message_header("message_header"), message_separator("message_separator"), @@ -71,7 +73,8 @@ class LLChatHistory : public LLUICtrl bottom_separator_pad("bottom_separator_pad"), top_header_pad("top_header_pad"), bottom_header_pad("bottom_header_pad"), - more_chat_text("more_chat_text") + more_chat_text("more_chat_text"), + notify_unread_msg("notify_unread_msg", true) {} }; @@ -100,7 +103,7 @@ class LLChatHistory : public LLUICtrl public: ~LLChatHistory(); - + LLSD getValue() const; void initFromParams(const Params&); /** @@ -122,6 +125,7 @@ class LLChatHistory : public LLUICtrl LLUUID mLastFromID; LLDate mLastMessageTime; bool mIsLastMessageFromLog; + bool mNotifyAboutUnreadMsg; //std::string mLastMessageTimeStr; std::string mMessageHeaderFilename; |