diff options
| author | Alexei Arabadji <aarabadji@productengine.com> | 2010-01-12 17:40:06 +0200 |
|---|---|---|
| committer | Alexei Arabadji <aarabadji@productengine.com> | 2010-01-12 17:40:06 +0200 |
| commit | a10fb56c373014b0900c502c7546dd9522f1831b (patch) | |
| tree | 54c542cc1274d34e4318dc4bdd58893a7f0c2e4a | |
| parent | 85467c0ba654e2a787b216b89807e10fe1b078d8 (diff) | |
| parent | fb7f1a5d2404c6d6e09d8b86dee4f3c71ce0342f (diff) | |
Automated merge with https://hg.aws.productengine.com/secondlife/viewer-2-0/
--HG--
branch : product-engine
| -rw-r--r-- | indra/newview/llviewermessage.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index 00d8851fe9..4e5655274d 100644 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -1759,10 +1759,9 @@ void process_improved_im(LLMessageSystem *msg, void **user_data) } else if (from_id.isNull()) { - // Messages from "Second Life" ID don't go to IM history - // messages which should be routed to IM window come from a user ID with name=SYSTEM_NAME - chat.mText = name + ": " + message; - LLFloaterChat::addChat(chat, FALSE, FALSE); + LLSD args; + args["MESSAGE"] = message; + LLNotificationsUtil::add("SystemMessage", args); } else if (to_id.isNull()) { |