Skip to content
Snippets Groups Projects
Commit e74e0c8d authored by Dave SIMmONs's avatar Dave SIMmONs
Browse files

ER-671 : Add LLRegionSayTo() LSL function. Added new chat type for direct...

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.
parent 3ce04bdc
No related branches found
No related tags found
No related merge requests found
......@@ -49,7 +49,8 @@ typedef enum e_chat_type
CHAT_TYPE_STOP = 5,
CHAT_TYPE_DEBUG_MSG = 6,
CHAT_TYPE_REGION = 7,
CHAT_TYPE_OWNER = 8
CHAT_TYPE_OWNER = 8,
CHAT_TYPE_DIRECT = 9 // From llRegionSayTo()
} EChatType;
typedef enum e_chat_audible_level
......
......@@ -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;
}
}
......
......@@ -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";
......
......@@ -763,4 +763,7 @@
<color
name="MenuBarProjectBgColor"
reference="MdBlue" />
<color
name="DirectChatColor"
reference="LtOrange" />
</colors>
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment