diff -r 845cab866155 indra/newview/llviewermessage.cpp --- a/indra/newview/llviewermessage.cpp Tue Jan 04 16:46:09 2011 -0500 +++ b/indra/newview/llviewermessage.cpp Wed Jan 05 20:50:40 2011 -0500 @@ -2746,6 +2746,14 @@ 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); }