summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorPaul Guslisty <pguslisty@productengine.com>2009-12-21 18:20:21 +0200
committerPaul Guslisty <pguslisty@productengine.com>2009-12-21 18:20:21 +0200
commit2305676fed6f1bbb0802a0e660f96874c54c2efd (patch)
tree2dc3fe2f0b69376f565b2659838a10021767d72c /indra
parent2af9653f0a17122fb38d5bfeb8dae04163d72c05 (diff)
Fixed low bug EXT - 3464 ("You" should be shown for Nearby chat window instead of avatar's name)
--HG-- branch : product-engine
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/llnearbychat.cpp2
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");