summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEugene Kondrashev <ekondrashev@productengine.com>2009-11-11 15:08:49 +0200
committerEugene Kondrashev <ekondrashev@productengine.com>2009-11-11 15:08:49 +0200
commit249af0bf9d24da0f6dc3fb1348c12fcbe543ca87 (patch)
tree258b4fc02790ab258949f1b608dbc181562488a8
parentcb96aa0913567be7c2b0974878c87fda5aa53c55 (diff)
Fixed normal bug EXT-2131-[BSI] Copy/pasted text chat logs are now much harder to read or post-process
--HG-- branch : product-engine
-rw-r--r--indra/newview/llchathistory.cpp5
1 files changed, 1 insertions, 4 deletions
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<LLChatHistory> 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