diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-01-31 12:34:17 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-01-31 12:34:17 -0500 |
| commit | ed308d15bf2f88f91687411cd92f6cc55b1e75b4 (patch) | |
| tree | 9353a91515097c1088ed850ab27372e433f2f7c1 /indra/newview/llviewermessage.cpp | |
| parent | 5322021746582195df6b7ad5843a7da09e617917 (diff) | |
| parent | cb6d59513eabe72029821a96191873351fd5c753 (diff) | |
merge changes for storm-845
Diffstat (limited to 'indra/newview/llviewermessage.cpp')
| -rw-r--r-- | indra/newview/llviewermessage.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index 6fc85a3944..103989ee80 100644 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -2721,6 +2721,14 @@ void process_improved_im(LLMessageSystem *msg, void **user_data) LLSD args; args["slurl"] = location; args["type"] = LLNotificationsUI::NT_NEARBYCHAT; + + // Look for IRC-style emotes here so object name formatting is correct + std::string prefix = message.substr(0, 4); + if (prefix == "/me " || prefix == "/me'") + { + chat.mChatStyle = CHAT_STYLE_IRC; + } + LLNotificationsUI::LLNotificationManager::instance().onChat(chat, args); } |