merge

1 files changed, 8 insertions, 0 deletions

diff --git a/indra/newview/llviewerchat.cpp b/indra/newview/llviewerchat.cpp
index e06fe7bda0..93687dbd5f 100644
--- a/indra/newview/llviewerchat.cpp
+++ b/indra/newview/llviewerchat.cpp
@@ -80,6 +80,10 @@ void LLViewerChat::getChatColor(const LLChat& chat, LLColor4& r_color)
 				{
 					r_color = LLUIColorTable::instance().getColor("llOwnerSayChatColor");
 				}
+				else if ( chat.mChatType == CHAT_TYPE_DIRECT )
+				{
+					r_color = LLUIColorTable::instance().getColor("DirectChatColor");
+				}
 				else
 				{
 					r_color = LLUIColorTable::instance().getColor("ObjectChatColor");
@@ -146,6 +150,10 @@ void LLViewerChat::getChatColor(const LLChat& chat, std::string& r_color_name, F
 				{
 					r_color_name = "llOwnerSayChatColor";
 				}
+				else if ( chat.mChatType == CHAT_TYPE_DIRECT )
+				{
+					r_color_name = "DirectChatColor";
+				}
 				else
 				{
 					r_color_name = "ObjectChatColor";