summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorIgor Borovkov <iborovkov@productengine.com>2010-02-25 16:14:26 +0200
committerIgor Borovkov <iborovkov@productengine.com>2010-02-25 16:14:26 +0200
commitf864d74a477d4fbeeef1c6e88f0ba499d6acb1ae (patch)
treea9681df3be14dfafa4dcb1db51430880bb114131 /indra
parent4adaf9e66dbaa54a2cfa57e38180f57b8c648fab (diff)
fixed EXT-5742 IM history: font color isn't applied for 'user not online/offline' system notifications
--HG-- branch : product-engine
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/llviewerchat.cpp3
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");
}