From 2afc64e6fa8aa0ee41290c8232733881026cab10 Mon Sep 17 00:00:00 2001 From: Eugene Kondrashev Date: Wed, 11 Nov 2009 13:08:02 +0200 Subject: Fixed Normal bug EXT-1959 - [BSI] emotes difficult to see in IM/Group chat --HG-- branch : product-engine --- indra/newview/llchathistory.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'indra/newview/llchathistory.cpp') diff --git a/indra/newview/llchathistory.cpp b/indra/newview/llchathistory.cpp index 2ccd6b7d35..056f2ee333 100644 --- a/indra/newview/llchathistory.cpp +++ b/indra/newview/llchathistory.cpp @@ -370,8 +370,7 @@ void LLChatHistory::appendWidgetMessage(const LLChat& chat, LLStyle::Params& sty appendWidget(p, view_text, false); //Append the text message - std::string message = chat.mText + '\n'; - appendText(message, FALSE, style_params); + appendText(chat.mText, FALSE, style_params); mLastFromName = chat.mFromName; blockUndo(); -- cgit v1.2.3 From 249af0bf9d24da0f6dc3fb1348c12fcbe543ca87 Mon Sep 17 00:00:00 2001 From: Eugene Kondrashev Date: Wed, 11 Nov 2009 15:08:49 +0200 Subject: Fixed normal bug EXT-2131-[BSI] Copy/pasted text chat logs are now much harder to read or post-process --HG-- branch : product-engine --- indra/newview/llchathistory.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'indra/newview/llchathistory.cpp') diff --git a/indra/newview/llchathistory.cpp b/indra/newview/llchathistory.cpp index 056f2ee333..289c8cca5a 100644 --- a/indra/newview/llchathistory.cpp +++ b/indra/newview/llchathistory.cpp @@ -47,7 +47,6 @@ #include "llmutelist.h" static LLDefaultChildRegistry::Register r("chat_history"); -static const std::string MESSAGE_USERNAME_DATE_SEPARATOR(" ----- "); std::string formatCurrentTime() { @@ -333,7 +332,7 @@ LLView* LLChatHistory::getHeader(const LLChat& chat) void LLChatHistory::appendWidgetMessage(const LLChat& chat, LLStyle::Params& style_params) { LLView* view = NULL; - std::string view_text; + std::string view_text = '[' + formatCurrentTime() + "]:[" + chat.mFromName + "] ";; LLInlineViewSegment::Params p; p.force_newline = true; @@ -343,14 +342,12 @@ void LLChatHistory::appendWidgetMessage(const LLChat& chat, LLStyle::Params& sty if (mLastFromName == chat.mFromName) { view = getSeparator(); - view_text = "\n"; p.top_pad = mTopSeparatorPad; p.bottom_pad = mBottomSeparatorPad; } else { view = getHeader(chat); - view_text = chat.mFromName + MESSAGE_USERNAME_DATE_SEPARATOR + formatCurrentTime() + '\n'; if (getText().size() == 0) p.top_pad = 0; else -- cgit v1.2.3 From 7123f0d447c39c0f81936eef8867b8ff3cc9cda8 Mon Sep 17 00:00:00 2001 From: Eugene Kondrashev Date: Wed, 11 Nov 2009 15:27:42 +0200 Subject: Additional fix for normal bug EXT-2131-[BSI] Copy/pasted text chat logs are now much harder to read or post-process --HG-- branch : product-engine --- indra/newview/llchathistory.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/llchathistory.cpp') diff --git a/indra/newview/llchathistory.cpp b/indra/newview/llchathistory.cpp index 289c8cca5a..3b893aa529 100644 --- a/indra/newview/llchathistory.cpp +++ b/indra/newview/llchathistory.cpp @@ -332,7 +332,7 @@ LLView* LLChatHistory::getHeader(const LLChat& chat) void LLChatHistory::appendWidgetMessage(const LLChat& chat, LLStyle::Params& style_params) { LLView* view = NULL; - std::string view_text = '[' + formatCurrentTime() + "]:[" + chat.mFromName + "] ";; + std::string view_text = "\n[" + formatCurrentTime() + "]:[" + chat.mFromName + "] ";; LLInlineViewSegment::Params p; p.force_newline = true; -- cgit v1.2.3