diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2008-08-13 19:37:05 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2008-08-13 19:37:05 +0000 |
| commit | b9b4a4d9347053a3834ca2928063136948f09d1d (patch) | |
| tree | c2affaf017c2967989ff0b4a2b125d348736a04a /indra/newview/llfloaterchat.cpp | |
| parent | 0a3b9e8e141a6f38ecbdf6020312e7a89b153bc4 (diff) | |
QAR-782 Merge featurettes batch #2
merge featurettes-6-merge-2 -> release
dataserver-is-deprecated
Diffstat (limited to 'indra/newview/llfloaterchat.cpp')
| -rw-r--r-- | indra/newview/llfloaterchat.cpp | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/indra/newview/llfloaterchat.cpp b/indra/newview/llfloaterchat.cpp index 745e7766f2..ba02ccc320 100644 --- a/indra/newview/llfloaterchat.cpp +++ b/indra/newview/llfloaterchat.cpp @@ -205,9 +205,10 @@ void add_timestamped_line(LLViewerTextEditor* edit, const LLChat &chat, const LL chat.mFromID != LLUUID::null && (line.length() > chat.mFromName.length() && line.find(chat.mFromName,0) == 0)) { - line = line.substr(chat.mFromName.length()); + std::string start_line = line.substr(0, chat.mFromName.length() + 1); + line = line.substr(chat.mFromName.length() + 1); const LLStyleSP &sourceStyle = LLStyleMap::instance().lookup(chat.mFromID); - edit->appendStyledText(chat.mFromName, false, prepend_newline, &sourceStyle); + edit->appendStyledText(start_line, false, prepend_newline, &sourceStyle); prepend_newline = false; } edit->appendColoredText(line, false, prepend_newline, color); @@ -420,7 +421,14 @@ LLColor4 get_text_color(const LLChat& chat) } else { - text_color = gSavedSettings.getColor4("AgentChatColor"); + if(gAgent.getID() == chat.mFromID) + { + text_color = gSavedSettings.getColor4("UserChatColor"); + } + else + { + text_color = gSavedSettings.getColor4("AgentChatColor"); + } } break; case CHAT_SOURCE_OBJECT: |