diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-26 09:50:56 +0000 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-26 09:50:56 +0000 |
| commit | 044e020bcb7e1dd94f689ba6977bcb07a87d8a35 (patch) | |
| tree | cf549fa816d92f90fc5de775cba08d91d30874be /indra/newview/llviewerchat.cpp | |
| parent | 9f079954af9ca80498bf6953d65cc7e77e956f26 (diff) | |
| parent | 92facf86d6bf1a7acecdc6e536ac2ad7bcdfdd96 (diff) | |
PE 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"); } |