diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2009-12-21 17:28:06 -0500 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2009-12-21 17:28:06 -0500 |
| commit | 97031cb90dce6ed8468e427abc09c99b290ee08d (patch) | |
| tree | 11b5ceba8856d8535e219c5673c6d005285f2b75 /indra/newview/llnearbychat.cpp | |
| parent | ced5b819d74fa70fc2050b13749bfe1387340583 (diff) | |
| parent | a32f857fe68f6b191f8029b1a5b137aaa364395b (diff) | |
merge
Diffstat (limited to 'indra/newview/llnearbychat.cpp')
| -rw-r--r-- | indra/newview/llnearbychat.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llnearbychat.cpp b/indra/newview/llnearbychat.cpp index 3a1ae5bf46..1a0183a8ba 100644 --- a/indra/newview/llnearbychat.cpp +++ b/indra/newview/llnearbychat.cpp @@ -178,6 +178,8 @@ void LLNearbyChat::addMessage(const LLChat& chat,bool archive) if (!chat.mMuted) { + tmp_chat.mFromName = chat.mFromID != gAgentID ? chat.mFromName : LLTrans::getString("You"); + if (chat.mChatStyle == CHAT_STYLE_IRC) { LLColor4 txt_color = LLUIColorTable::instance().getColor("White"); |