diff options
| author | Dave Parks <davep@lindenlab.com> | 2010-03-01 15:25:35 -0600 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2010-03-01 15:25:35 -0600 |
| commit | 99b0d17833a8a2efab9c08edf2ada3718736a5ba (patch) | |
| tree | 8951e7aabe026917d299436ebc28019f9966cd02 /indra/newview/llviewerchat.cpp | |
| parent | 746037362ed07af0c799caf22cf9e425744359a0 (diff) | |
| parent | 7564813d608f79e6fc70e1f58a861c640d1b6fa2 (diff) | |
Merge with viewer-2-0
Diffstat (limited to 'indra/newview/llviewerchat.cpp')
| -rw-r--r-- | indra/newview/llviewerchat.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llviewerchat.cpp b/indra/newview/llviewerchat.cpp index 8de87eb602..320456e1e2 100644 --- a/indra/newview/llviewerchat.cpp +++ b/indra/newview/llviewerchat.cpp @@ -37,6 +37,7 @@ #include "llagent.h" // gAgent #include "lluicolortable.h" #include "llviewercontrol.h" // gSavedSettings +#include "llinstantmessage.h" //SYSTEM_FROM // LLViewerChat @@ -55,7 +56,7 @@ void LLViewerChat::getChatColor(const LLChat& chat, LLColor4& r_color) r_color = LLUIColorTable::instance().getColor("SystemChatColor"); break; case CHAT_SOURCE_AGENT: - if (chat.mFromID.isNull()) + if (chat.mFromID.isNull() || SYSTEM_FROM == chat.mFromName) { r_color = LLUIColorTable::instance().getColor("SystemChatColor"); } |