diff options
| author | PavelK ProductEngine <pkrivich@productengine.com> | 2013-04-25 18:47:09 +0300 |
|---|---|---|
| committer | PavelK ProductEngine <pkrivich@productengine.com> | 2013-04-25 18:47:09 +0300 |
| commit | d07fab9e165e354678f5f8f78d331f8cfe8618d2 (patch) | |
| tree | 558130f6143a33cf1ecccc1ba034ee7cac4ca599 /indra/newview | |
| parent | 8431da8de0e8130aedc1ce134b45ba4f6dfb5d83 (diff) | |
CHUI-759 FIXED Group invites never received in do not disturb mode when leaving do not disturb mode
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/lldonotdisturbnotificationstorage.cpp | 3 | ||||
| -rwxr-xr-x | indra/newview/llviewermessage.cpp | 3 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/notifications.xml | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/indra/newview/lldonotdisturbnotificationstorage.cpp b/indra/newview/lldonotdisturbnotificationstorage.cpp index b9e3b60240..71bc4f15d2 100644 --- a/indra/newview/lldonotdisturbnotificationstorage.cpp +++ b/indra/newview/lldonotdisturbnotificationstorage.cpp @@ -115,7 +115,8 @@ void LLDoNotDisturbNotificationStorage::saveNotifications() { LLNotificationPtr notificationPtr = historyIter->second; - if (!notificationPtr->isRespondedTo() && !notificationPtr->isCancelled() && !notificationPtr->isExpired()) + if (!notificationPtr->isRespondedTo() && !notificationPtr->isCancelled() && + !notificationPtr->isExpired() && !notificationPtr->isPersistent()) { data.append(notificationPtr->asLLSD(true)); } diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index a13c793899..92a050e29b 100755 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -2644,7 +2644,8 @@ void process_improved_im(LLMessageSystem *msg, void **user_data) { send_do_not_disturb_message(msg, from_id); } - else + + if (!is_muted) { LL_INFOS("Messaging") << "Received IM_GROUP_INVITATION message." << LL_ENDL; // Read the binary bucket for more information. diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 49e2ddfb14..bb3044a0d5 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -6524,7 +6524,7 @@ Your object named <nolink>[OBJECTFROMNAME]</nolink> has given you th icon="notify.tga" name="JoinGroup" persist="true" - type="notify"> + type="offer"> <tag>group</tag> [MESSAGE] <form name="form"> |