diff options
author | Oz Linden <oz@lindenlab.com> | 2011-03-29 19:21:41 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2011-03-29 19:21:41 -0400 |
commit | 7cb4f2d87dc8619d8ad86cb82f6687f1a9821a69 (patch) | |
tree | 76eb80864288acd35fa7b0892a5aba96c13a860c /indra/newview/llnearbychathandler.cpp | |
parent | 39d83cb74f5978e926ff02dcb20a64802429bc69 (diff) | |
parent | 9c0757511ec4ed12b47c6d3fd2ef20fca6828a6e (diff) |
merge changes for storm-1086
Diffstat (limited to 'indra/newview/llnearbychathandler.cpp')
-rw-r--r-- | indra/newview/llnearbychathandler.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/llnearbychathandler.cpp b/indra/newview/llnearbychathandler.cpp index de5439e4e0..0d9daeb44e 100644 --- a/indra/newview/llnearbychathandler.cpp +++ b/indra/newview/llnearbychathandler.cpp @@ -558,6 +558,7 @@ void LLNearbyChatHandler::processChat(const LLChat& chat_msg, const LLSD &args) } */ + // Add a nearby chat toast. LLUUID id; id.generate(); @@ -583,6 +584,10 @@ void LLNearbyChatHandler::processChat(const LLChat& chat_msg, const LLSD &args) notification["text_color"] = r_color_name; notification["color_alpha"] = r_color_alpha; notification["font_size"] = (S32)LLViewerChat::getChatFontSize() ; + + // Pass sender info so that it can be rendered properly (STORM-1021). + notification["sender_slurl"] = LLViewerChat::getSenderSLURL(chat_msg, args); + channel->addNotification(notification); } |