From e74e0c8da5ecdb107f89bd33de81397ac41f5a5b Mon Sep 17 00:00:00 2001
From: Dave SIMmONs <simon@lindenlab.com>
Date: Tue, 5 Apr 2011 09:07:11 -0700
Subject: ER-671 : Add LLRegionSayTo() LSL function.  Added new chat type for
 direct messages to match server code, use light orange for text.  Reviewed by
 Kelly.

---
 indra/newview/llnearbychatbarlistener.cpp | 4 ++--
 indra/newview/llviewerchat.cpp            | 8 ++++++++
 indra/newview/skins/default/colors.xml    | 3 +++
 3 files changed, 13 insertions(+), 2 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/newview/llnearbychatbarlistener.cpp b/indra/newview/llnearbychatbarlistener.cpp
index 99286d972b..0d64eaed47 100644
--- a/indra/newview/llnearbychatbarlistener.cpp
+++ b/indra/newview/llnearbychatbarlistener.cpp
@@ -60,8 +60,8 @@ void LLNearbyChatBarListener::sendChat(LLSD const & chat_data) const
 	if (chat_data.has("channel"))
 	{
 		channel = chat_data["channel"].asInteger();
-		if (channel < 0 || channel >= 2147483647)
-		{	// Use 0 up to (but not including) DEBUG_CHANNEL (wtf isn't that defined??)
+		if (channel < 0 || channel >= CHAT_CHANNEL_DEBUG)
+		{	// Use 0 up to (but not including) CHAT_CHANNEL_DEBUG
 			channel = 0;
 		}
 	}
diff --git a/indra/newview/llviewerchat.cpp b/indra/newview/llviewerchat.cpp
index 0af850a46b..2f449978dc 100644
--- a/indra/newview/llviewerchat.cpp
+++ b/indra/newview/llviewerchat.cpp
@@ -75,6 +75,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");
@@ -140,6 +144,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";
diff --git a/indra/newview/skins/default/colors.xml b/indra/newview/skins/default/colors.xml
index 75aec21f93..d197ab2fdf 100644
--- a/indra/newview/skins/default/colors.xml
+++ b/indra/newview/skins/default/colors.xml
@@ -763,4 +763,7 @@
     <color
      name="MenuBarProjectBgColor"
      reference="MdBlue" />
+    <color
+     name="DirectChatColor"
+     reference="LtOrange" />
 </colors>
-- 
cgit v1.2.3