diff options
| author | Tofu Buzzard <no-email> | 2011-02-01 09:45:28 -0800 |
|---|---|---|
| committer | Tofu Buzzard <no-email> | 2011-02-01 09:45:28 -0800 |
| commit | ce90d8f8da4f0d2ca6b3aa3a96c0ce68a64bd495 (patch) | |
| tree | d4d31830e96d75a8062074c3ce98b5884a0b47ba /indra/newview/llviewermessage.cpp | |
| parent | 3f139aa20ab0ebd983837c2d041ca53a0e7c5fb8 (diff) | |
| parent | 7ddf7e17c01242901cef9219e27077e0d1243997 (diff) | |
merge
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 ae8bd3f29a..f3cbb8cce3 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); } |