diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2009-09-02 02:59:07 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2009-09-02 02:59:07 +0000 |
| commit | 5612f13dc8693d89cb5c89f8b1a15115742fba8d (patch) | |
| tree | 51e9fb2dcf50ad701deee378e6a146aa0ba600a5 /indra/newview/llnearbychat.cpp | |
| parent | 1a5cb4fbfb718a6740bdee0442efbb3ae2897b9b (diff) | |
merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1516 https://svn.aws.productengine.com/secondlife/pe/stable-2@1526 -> viewer-2.0.0-3
* Bugs: EXT-622 EXT-702 EXT-626 EXT-638 EXT-600 EXT-543 EXT-656 EXT-801
* New Dev: EXT-282 EXT-782 EXT-694 EXT-797 EXT-798 EXT-799 EXT-453
Diffstat (limited to 'indra/newview/llnearbychat.cpp')
| -rw-r--r-- | indra/newview/llnearbychat.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/indra/newview/llnearbychat.cpp b/indra/newview/llnearbychat.cpp index 3856a86da0..6150d5da37 100644 --- a/indra/newview/llnearbychat.cpp +++ b/indra/newview/llnearbychat.cpp @@ -183,9 +183,13 @@ LLColor4 nearbychat_get_text_color(const LLChat& chat) void nearbychat_add_timestamped_line(LLViewerTextEditor* edit, LLChat chat, const LLColor4& color) { - std::string line = chat.mFromName; - line +=": "; - line +=chat.mText; + std::string line = chat.mText; + + //chat.mText starts with Avatar Name if entered message was "/me <action>". + // In this case output chat message should be "<Avatar Name> <action>". See EXT-656 + // See also process_chat_from_simulator() in the llviewermessage.cpp where ircstyle = TRUE; + if (CHAT_STYLE_IRC != chat.mChatStyle) + line = chat.mFromName + ": " + line; bool prepend_newline = true; if (gSavedSettings.getBOOL("ChatShowTimestamps")) |