diff options
| author | angela <angela@lindenlab.com> | 2010-02-28 20:55:58 +0800 |
|---|---|---|
| committer | angela <angela@lindenlab.com> | 2010-02-28 20:55:58 +0800 |
| commit | 1df1be10afd14fe80d491617e175f4586a78f71f (patch) | |
| tree | 6e7a55591c2166ae732a7854f329e9bfd800546b /indra/newview/llviewerchat.cpp | |
| parent | 75e5441f2da7252749174db70719a78637bc4eeb (diff) | |
| parent | b20307a683073c415804966ed5b363fb68879ee5 (diff) | |
merge
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"); } |