summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorMnikolenko ProductEngine <mnikolenko@productengine.com>2015-07-14 12:07:14 +0300
committerMnikolenko ProductEngine <mnikolenko@productengine.com>2015-07-14 12:07:14 +0300
commit3e39a29683864a833cf3c5590597a0c517daa23b (patch)
tree321a650fab8a140f7e1ac7e1ccdc4f2b8e25ba3f /indra/newview
parent4a3d2eff64453915648979ae493f9bbaa1c0fcf8 (diff)
MAINT-5390 FIXED physical objects that roll off region go to trash without notification
Diffstat (limited to 'indra/newview')
-rwxr-xr-xindra/newview/llviewermessage.cpp9
1 files changed, 3 insertions, 6 deletions
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index b3dd7207ef..62314a0f4e 100755
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -2861,6 +2861,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
case IM_FROM_TASK:
{
+
if (is_do_not_disturb && !is_owned_by_me)
{
return;
@@ -2944,17 +2945,13 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
payload["from_id"] = from_id;
payload["slurl"] = location;
payload["name"] = name;
- std::string session_name;
+
if (from_group)
{
payload["group_owned"] = "true";
}
- LLNotification::Params params("ServerObjectMessage");
- params.substitutions = substitutions;
- params.payload = payload;
-
- LLPostponedNotification::add<LLPostponedServerObjectNotification>(params, from_id, from_group);
+ LLNotificationsUtil::add("ServerObjectMessage", substitutions, payload);
}
break;