From d07fab9e165e354678f5f8f78d331f8cfe8618d2 Mon Sep 17 00:00:00 2001 From: PavelK ProductEngine Date: Thu, 25 Apr 2013 18:47:09 +0300 Subject: CHUI-759 FIXED Group invites never received in do not disturb mode when leaving do not disturb mode --- indra/newview/llviewermessage.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'indra/newview/llviewermessage.cpp') 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. -- cgit v1.2.3 From 38c1cd2d29fa48b1a28a6ba1d7ef49ae00c9a5e0 Mon Sep 17 00:00:00 2001 From: Cinders Date: Mon, 13 May 2013 17:18:38 -0600 Subject: STORM-1948 - Fix for Set home to here - screen_home.bmp not saved --- indra/newview/llviewermessage.cpp | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'indra/newview/llviewermessage.cpp') diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index 3c0d6189ac..6fa44ec23c 100755 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -5929,6 +5929,15 @@ bool attempt_standard_notification(LLMessageSystem* msgsystem) return true; } } + // HACK -- handle callbacks for specific alerts. + if( notificationID == "HomePositionSet" ) + { + // save the home location image to disk + std::string snap_filename = gDirUtilp->getLindenUserDir(); + snap_filename += gDirUtilp->getDirDelimiter(); + snap_filename += SCREEN_HOME_FILENAME; + gViewerWindow->saveSnapshot(snap_filename, gViewerWindow->getWindowWidthRaw(), gViewerWindow->getWindowHeightRaw(), FALSE, FALSE); + } LLNotificationsUtil::add(notificationID, llsdBlock); return true; @@ -6004,14 +6013,6 @@ void process_alert_core(const std::string& message, BOOL modal) { LLViewerStats::getInstance()->incStat(LLViewerStats::ST_KILLED_COUNT); } - else if( message == "Home position set." ) - { - // save the home location image to disk - std::string snap_filename = gDirUtilp->getLindenUserDir(); - snap_filename += gDirUtilp->getDirDelimiter(); - snap_filename += SCREEN_HOME_FILENAME; - gViewerWindow->saveSnapshot(snap_filename, gViewerWindow->getWindowWidthRaw(), gViewerWindow->getWindowHeightRaw(), FALSE, FALSE); - } const std::string ALERT_PREFIX("ALERT: "); const std::string NOTIFY_PREFIX("NOTIFY: "); -- cgit v1.2.3 From 3187ee18e1fa5a8b3f719f26f32b01b817791a4e Mon Sep 17 00:00:00 2001 From: PavelK ProductEngine Date: Wed, 15 May 2013 20:31:47 +0300 Subject: CHUI-945 FIXED Add Object IMs to Chat Notification Preferences --- indra/newview/llviewermessage.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'indra/newview/llviewermessage.cpp') diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index 3a57e2a3c9..013d8c86f8 100755 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -3666,6 +3666,7 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data) LLSD msg_notify = LLSD(LLSD::emptyMap()); msg_notify["session_id"] = LLUUID(); msg_notify["from_id"] = chat.mFromID; + msg_notify["source_type"] = chat.mSourceType; on_new_message(msg_notify); } } -- cgit v1.2.3 From b60b6e5452825654ff4b3718d72c28cf66cf1692 Mon Sep 17 00:00:00 2001 From: maksymsproductengine Date: Fri, 19 Jul 2013 20:25:21 +0300 Subject: CHUI-985 POSTPONED [CHUIBUG]User receives three friendship offer notifications simultaneously when he accept/decline friendship offer --- indra/newview/llviewermessage.cpp | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'indra/newview/llviewermessage.cpp') diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index 3766b30438..61353dba7d 100755 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -259,11 +259,15 @@ bool friendship_offer_callback(const LLSD& notification, const LLSD& response) break; } - LLNotificationFormPtr modified_form(new LLNotificationForm(*notification_ptr->getForm())); - modified_form->setElementEnabled("Accept", false); - modified_form->setElementEnabled("Decline", false); - notification_ptr->updateForm(modified_form); - notification_ptr->repost(); + // TODO: this set of calls has undesirable behavior under Windows OS (CHUI-985): + // here appears three additional toasts instead one modified + // need investigation and fix + + // LLNotificationFormPtr modified_form(new LLNotificationForm(*notification_ptr->getForm())); + // modified_form->setElementEnabled("Accept", false); + // modified_form->setElementEnabled("Decline", false); + // notification_ptr->updateForm(modified_form); + // notification_ptr->repost(); } return false; -- cgit v1.2.3 From 5c7b84c682ea0f92f3f4389b0dbe758b8cadc6eb Mon Sep 17 00:00:00 2001 From: Xiaohong Bao Date: Fri, 13 Sep 2013 10:49:31 -0600 Subject: fix for SH-4494: interesting: deleted objects reappear --- indra/newview/llviewermessage.cpp | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) (limited to 'indra/newview/llviewermessage.cpp') diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index ce83221d2c..2550ab34ee 100755 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -4560,9 +4560,6 @@ void process_terse_object_update_improved(LLMessageSystem *mesgsys, void **user_ static LLTrace::TimeBlock FTM_PROCESS_OBJECTS("Process Kill Objects"); -const U32 KILLOBJECT_DELETE_OPCODE = 0; - - void process_kill_object(LLMessageSystem *mesgsys, void **user_data) { LL_RECORD_BLOCK_TIME(FTM_PROCESS_OBJECTS); @@ -4577,20 +4574,12 @@ void process_kill_object(LLMessageSystem *mesgsys, void **user_data) regionp = LLWorld::getInstance()->getRegion(host); } - bool delete_object = false; + bool delete_object = LLViewerRegion::sVOCacheCullingEnabled; S32 num_objects = mesgsys->getNumberOfBlocksFast(_PREHASH_ObjectData); for (S32 i = 0; i < num_objects; ++i) { U32 local_id; mesgsys->getU32Fast(_PREHASH_ObjectData, _PREHASH_ID, local_id, i); - if (local_id == KILLOBJECT_DELETE_OPCODE) - { - // This local_id is invalid, but was sent by the server to flag - // all subsequent local_id's as objects that were actually deleted - // rather than unsubscribed from interestlist. - delete_object = true; - continue; - } LLViewerObjectList::getUUIDFromLocal(id, local_id, ip, port); if (id == LLUUID::null) @@ -4623,10 +4612,10 @@ void process_kill_object(LLMessageSystem *mesgsys, void **user_data) gObjectList.killObject(objectp); } - if(delete_object) + if(delete_object) { - regionp->killCacheEntry(local_id); - } + regionp->killCacheEntry(local_id); + } // We should remove the object from selection after it is marked dead by gObjectList to make LLToolGrab, // which is using the object, release the mouse capture correctly when the object dies. -- cgit v1.2.3