diff options
author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-09 14:21:49 +0000 |
---|---|---|
committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-09 14:21:49 +0000 |
commit | 3c75565675032ec1531db59716b4ab8bbb969d3c (patch) | |
tree | c0c042755954bc0a557ffb4e1032764e898445f3 /indra/newview/llviewermessage.cpp | |
parent | 5abb6dece78d9c7639511830590e0f447790fa82 (diff) | |
parent | 99aad90f63f0bf58f71a283447959e55833905db (diff) |
PE merge
Diffstat (limited to 'indra/newview/llviewermessage.cpp')
-rw-r--r-- | indra/newview/llviewermessage.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index 42f7793b5a..d9b5344dd4 100644 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -1842,6 +1842,11 @@ void process_improved_im(LLMessageSystem *msg, void **user_data) } else { + /* + EXT-5099 + currently there is no way to store in history only... + using LLNotificationsUtil::add will add message to Nearby Chat + // muted user, so don't start an IM session, just record line in chat // history. Pretend the chat is from a local agent, // so it will go into the history but not be shown on screen. @@ -1849,6 +1854,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data) LLSD args; args["MESSAGE"] = buffer; LLNotificationsUtil::add("SystemMessageTip", args); + */ } } break; |