diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2010-01-11 16:05:42 -0800 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2010-01-11 16:05:42 -0800 |
| commit | 1a35fe8725d4a55ef1e1b07d59db8e8d0db5e6bf (patch) | |
| tree | 04895ab55cf6ab33f1412131c76a71f4f4d549d4 /indra/newview/llnearbychat.cpp | |
| parent | 8440d99e4498882dfc61459a91eba746ad717000 (diff) | |
| parent | 2aaa7971945823f53f0a01028036c37361bcfa17 (diff) | |
Merge
Diffstat (limited to 'indra/newview/llnearbychat.cpp')
| -rw-r--r-- | indra/newview/llnearbychat.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llnearbychat.cpp b/indra/newview/llnearbychat.cpp index e7043b2d00..fc0e51b76d 100644 --- a/indra/newview/llnearbychat.cpp +++ b/indra/newview/llnearbychat.cpp @@ -178,7 +178,7 @@ void LLNearbyChat::addMessage(const LLChat& chat,bool archive) if (!chat.mMuted) { - tmp_chat.mFromName = chat.mFromID != gAgentID ? chat.mFromName : LLTrans::getString("You"); + tmp_chat.mFromName = chat.mFromName; if (chat.mChatStyle == CHAT_STYLE_IRC) { |