diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-12-07 14:56:36 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-12-07 14:56:36 -0500 |
| commit | 6a59861bde42e1b8ddc8c19a0b37a2b0a7011f7a (patch) | |
| tree | 7a6d04e723a71c33205cdfa9815006d45310657c /indra/newview/llvoavatar.cpp | |
| parent | 6a0c02c1b1e6ea3d84f06f2ab58402a98eece462 (diff) | |
| parent | d9b4570883652d647c05083c18fac1a088efd6e2 (diff) | |
Automated merge up from viewer-development
Diffstat (limited to 'indra/newview/llvoavatar.cpp')
| -rw-r--r-- | indra/newview/llvoavatar.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp index 36d7601deb..e75fbf9bd4 100644 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp @@ -3056,7 +3056,7 @@ void LLVOAvatar::idleUpdateNameTagText(BOOL new_name) std::deque<LLChat>::iterator chat_iter = mChats.begin(); mNameText->clearString(); - LLColor4 new_chat = LLUIColorTable::instance().getColor( "NameTagChat" ); + LLColor4 new_chat = LLUIColorTable::instance().getColor( isSelf() ? "UserChatColor" : "AgentChatColor" ); LLColor4 normal_chat = lerp(new_chat, LLColor4(0.8f, 0.8f, 0.8f, 1.f), 0.7f); LLColor4 old_chat = lerp(normal_chat, LLColor4(0.6f, 0.6f, 0.6f, 1.f), 0.7f); if (mTyping && mChats.size() >= MAX_BUBBLE_CHAT_UTTERANCES) |