summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorAlexei Arabadji <aarabadji@productengine.com>2010-02-18 20:21:02 +0200
committerAlexei Arabadji <aarabadji@productengine.com>2010-02-18 20:21:02 +0200
commitc4a3bee33562f607bbd56a420bfcb424e00f2f41 (patch)
tree6d11bbc30bb39452e38a22735efdaecdc95db99a /indra/newview
parent5e26566f486611a49454cd83b0dd7f2dbad20d8b (diff)
fixed major EXT-5493 “llInstantMessage sends message to "nearby chat" window,
but not to toasts in viewer”, made llInstantMessage logged into nearby chat window and nearby chat toast; --HG-- branch : product-engine
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llviewermessage.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index 8aa642bdb6..cf7fb8d7eb 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -2212,7 +2212,8 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
LLSD args;
args["owner_id"] = from_id;
args["slurl"] = location;
- nearby_chat->addMessage(chat, true, args);
+ args["type"] = LLNotificationsUI::NT_NEARBYCHAT;
+ LLNotificationsUI::LLNotificationManager::instance().onChat(chat, args);
}