diff options
| -rw-r--r-- | doc/contributions.txt | 1 | ||||
| -rw-r--r-- | indra/newview/llviewermessage.cpp | 8 |
2 files changed, 9 insertions, 0 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt index 3ac9da3e65..c61ae66b13 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -384,6 +384,7 @@ Jonathan Yap STORM-869 STORM-785 STORM-812 + STORM-829 VWR-17801 VWR-24347 STORM-844 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); } |