summaryrefslogtreecommitdiff
path: root/indra/newview/llnearbychathandler.cpp
diff options
context:
space:
mode:
authorangela <angela@lindenlab.com>2009-11-16 20:52:22 +0800
committerangela <angela@lindenlab.com>2009-11-16 20:52:22 +0800
commitc5a01e8b3514383d0c6fd50c999803bf8eb86d1d (patch)
tree93c1063246efa0204a60a153cce6977661685573 /indra/newview/llnearbychathandler.cpp
parentbd42c1ae2cd6bb6e005478cc121c2b5d7a844eb4 (diff)
parent1baf1d218644ac5dc00d9b41119a1ef168c709a2 (diff)
Automated merge with ssh://angela@hg.lindenlab.com/viewer/viewer-2-0/
Diffstat (limited to 'indra/newview/llnearbychathandler.cpp')
-rw-r--r--indra/newview/llnearbychathandler.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llnearbychathandler.cpp b/indra/newview/llnearbychathandler.cpp
index 458845fff3..74a75d0369 100644
--- a/indra/newview/llnearbychathandler.cpp
+++ b/indra/newview/llnearbychathandler.cpp
@@ -341,6 +341,7 @@ void LLNearbyChatHandler::processChat(const LLChat& chat_msg)
notification["time"] = chat_msg.mTime;
notification["source"] = (S32)chat_msg.mSourceType;
notification["chat_type"] = (S32)chat_msg.mChatType;
+ notification["chat_style"] = (S32)chat_msg.mChatStyle;
std::string r_color_name = "White";
F32 r_color_alpha = 1.0f;