From 79928c65329146920558d9bc286f643ccf8dca7f Mon Sep 17 00:00:00 2001 From: AlexanderP ProductEngine Date: Mon, 7 May 2012 20:05:07 +0300 Subject: CHUI-103 Repair drawing messages with prepend new line --- indra/newview/llchathistory.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'indra/newview/llchathistory.h') diff --git a/indra/newview/llchathistory.h b/indra/newview/llchathistory.h index 28344e6a10..4cd9c75e1c 100644 --- a/indra/newview/llchathistory.h +++ b/indra/newview/llchathistory.h @@ -138,6 +138,10 @@ class LLChatHistory : public LLUICtrl S32 mTopHeaderPad; S32 mBottomHeaderPad; + S32 mPrependNewLineState; + + bool isNeedPrependNewline() {return (mPrependNewLineState-- > 0);} + class LLLayoutPanel* mMoreChatPanel; LLTextBox* mMoreChatText; LLTextEditor* mEditor; -- cgit v1.2.3 From 7b8251fd2f169136fc45e4c17104da676f75727b Mon Sep 17 00:00:00 2001 From: AlexanderP ProductEngine Date: Mon, 7 May 2012 21:54:09 +0300 Subject: CHUI-103 WIP Added settings for switching text view mode --- indra/newview/llchathistory.h | 4 ---- 1 file changed, 4 deletions(-) (limited to 'indra/newview/llchathistory.h') diff --git a/indra/newview/llchathistory.h b/indra/newview/llchathistory.h index 4cd9c75e1c..28344e6a10 100644 --- a/indra/newview/llchathistory.h +++ b/indra/newview/llchathistory.h @@ -138,10 +138,6 @@ class LLChatHistory : public LLUICtrl S32 mTopHeaderPad; S32 mBottomHeaderPad; - S32 mPrependNewLineState; - - bool isNeedPrependNewline() {return (mPrependNewLineState-- > 0);} - class LLLayoutPanel* mMoreChatPanel; LLTextBox* mMoreChatText; LLTextEditor* mEditor; -- cgit v1.2.3 From 1a913365b594de81de56896a9fbdfd6d8c4f21e0 Mon Sep 17 00:00:00 2001 From: Paul ProductEngine Date: Thu, 6 Sep 2012 23:08:10 +0300 Subject: CHUI-319 FIXED ("User has said something new" text shown when navigating chat history with More History button) - Added flag to chat history whether to show notification about unread messages or not --- indra/newview/llchathistory.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'indra/newview/llchathistory.h') diff --git a/indra/newview/llchathistory.h b/indra/newview/llchathistory.h index 28344e6a10..990c52f31b 100644 --- a/indra/newview/llchathistory.h +++ b/indra/newview/llchathistory.h @@ -60,6 +60,8 @@ class LLChatHistory : public LLUICtrl Optional more_chat_text; + Optional 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) {} }; @@ -122,6 +125,7 @@ class LLChatHistory : public LLUICtrl LLUUID mLastFromID; LLDate mLastMessageTime; bool mIsLastMessageFromLog; + bool mNotifyAboutUnreadMsg; //std::string mLastMessageTimeStr; std::string mMessageHeaderFilename; -- cgit v1.2.3 From 48c7e2cee70996048b0974c6cdda67cdea11a32c Mon Sep 17 00:00:00 2001 From: "Jeff (Gioffredo Linden)" Date: Fri, 12 Oct 2012 18:14:57 -0400 Subject: Expose Chat history to VITA by adding getValue method to llchathistory object --- indra/newview/llchathistory.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/llchathistory.h') diff --git a/indra/newview/llchathistory.h b/indra/newview/llchathistory.h index 990c52f31b..fa88483fcd 100644 --- a/indra/newview/llchathistory.h +++ b/indra/newview/llchathistory.h @@ -103,7 +103,7 @@ class LLChatHistory : public LLUICtrl public: ~LLChatHistory(); - + LLSD getVlue(); void initFromParams(const Params&); /** -- cgit v1.2.3 From 5f4fbffc82ae755235ead5e1b5883cc909e77e77 Mon Sep 17 00:00:00 2001 From: "Jeff (Gioffredo Linden)" Date: Fri, 12 Oct 2012 20:30:06 -0400 Subject: Fix typo --- indra/newview/llchathistory.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/llchathistory.h') diff --git a/indra/newview/llchathistory.h b/indra/newview/llchathistory.h index fa88483fcd..effdd75911 100644 --- a/indra/newview/llchathistory.h +++ b/indra/newview/llchathistory.h @@ -103,7 +103,7 @@ class LLChatHistory : public LLUICtrl public: ~LLChatHistory(); - LLSD getVlue(); + LLSD getValue(); void initFromParams(const Params&); /** -- cgit v1.2.3 From 337cd3aa9d8a8beaebd35ec6b53f09709e35a4d4 Mon Sep 17 00:00:00 2001 From: "Jeff (Gioffredo Linden)" Date: Tue, 16 Oct 2012 15:22:42 -0400 Subject: Make getValue const to fix Windows builds - and be more robust --- indra/newview/llchathistory.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/llchathistory.h') diff --git a/indra/newview/llchathistory.h b/indra/newview/llchathistory.h index effdd75911..b65d222b53 100644 --- a/indra/newview/llchathistory.h +++ b/indra/newview/llchathistory.h @@ -103,7 +103,7 @@ class LLChatHistory : public LLUICtrl public: ~LLChatHistory(); - LLSD getValue(); + const LLSD getValue(); void initFromParams(const Params&); /** -- cgit v1.2.3 From 86c3a45b6749387991064df6a42b1d046bd9d4d8 Mon Sep 17 00:00:00 2001 From: "Jeff (Gioffredo Linden)" Date: Tue, 16 Oct 2012 16:08:25 -0400 Subject: Move const kw location --- indra/newview/llchathistory.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/llchathistory.h') diff --git a/indra/newview/llchathistory.h b/indra/newview/llchathistory.h index b65d222b53..bb6d4fb59c 100644 --- a/indra/newview/llchathistory.h +++ b/indra/newview/llchathistory.h @@ -103,7 +103,7 @@ class LLChatHistory : public LLUICtrl public: ~LLChatHistory(); - const LLSD getValue(); + LLSD getValue() const; void initFromParams(const Params&); /** -- cgit v1.2.3