diff options
| author | Don Kjer <don@lindenlab.com> | 2011-02-19 00:17:12 +0000 |
|---|---|---|
| committer | Don Kjer <don@lindenlab.com> | 2011-02-19 00:17:12 +0000 |
| commit | 8330a4d0fd046834a27a988102b439a6ec1f0aa2 (patch) | |
| tree | 7fd2227522bf5c2377a45124cb50aad0afb90597 /indra/newview/llviewermessage.cpp | |
| parent | 3f5760b5ee4e422e11f3416133b7a4c3a73b1d8c (diff) | |
| parent | 18bf5f09b22a2c36ccf543104b1115a7b0b9db71 (diff) | |
Merge of ssh://hg.lindenlab.com/nat/viewer-eventapi2/
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 7e8fbf7345..852911ceb7 100644 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -2711,6 +2711,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); } |