diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-03-03 11:26:25 +0000 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-03-03 11:26:25 +0000 |
| commit | 6ecec59fda7d248d2640cb0a4fd95276604755a9 (patch) | |
| tree | 063583a1f9f7441356814be5891e6a7bcc61b9d4 /indra/newview/llviewerchat.cpp | |
| parent | 1eff2a33b1fab8ebe757ce30b36dc71df5b58cb9 (diff) | |
| parent | 5777dfaae6268dffee83d7a457c024b1a89f81ff (diff) | |
Merge from 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"); } |