From d0b5e6b0b4acebd1b11685dea290b830957ba9dc Mon Sep 17 00:00:00 2001
From: Jonathan Yap <none@none>
Date: Thu, 6 Jan 2011 06:07:11 -0500
Subject: [PATCH] STORM-829 Viewer 2 does not parse /me in object Instant
Messages
---
doc/contributions.txt | 3 ++-
indra/newview/llviewermessage.cpp | 8 ++++++++
2 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/doc/contributions.txt b/doc/contributions.txt
index 0954704c262..4e6c662e4f5 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -370,8 +370,9 @@ Jonathan Yap
STORM-679
STORM-737
STORM-726
- VWR-17801
STORM-785
+ STORM-829
+ VWR-17801
Kage Pixel
VWR-11
Ken March
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index 7dc5d96689d..7f7855c08c2 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -2746,6 +2746,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);
}
--
GitLab