From 850ea1ff7a1891968e04ab67f0ccab53e89d939b Mon Sep 17 00:00:00 2001 From: Hecklezz Date: Sat, 11 Oct 2025 21:30:23 +1000 Subject: [PATCH 1/2] Fixed trying to display an invalid notification for RemoveItemWarn --- indra/newview/llpanelobjectinventory.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/indra/newview/llpanelobjectinventory.cpp b/indra/newview/llpanelobjectinventory.cpp index f90d6d5b3f6..a8927c81eb2 100644 --- a/indra/newview/llpanelobjectinventory.cpp +++ b/indra/newview/llpanelobjectinventory.cpp @@ -388,7 +388,7 @@ bool LLTaskInvFVBridge::removeItem() LLSD payload; payload["task_id"] = mPanel->getTaskUUID(); payload["inventory_ids"].append(mUUID); - LLNotificationsUtil::add("RemoveItemWarn", LLSD(), payload, boost::bind(&remove_task_inventory_callback, _1, _2, mPanel)); + LLNotificationsUtil::add("CantModifyContentInNoModTask", LLSD(), payload, boost::bind(&remove_task_inventory_callback, _1, _2, mPanel)); return false; } } @@ -417,7 +417,7 @@ void LLTaskInvFVBridge::removeBatch(std::vector& batch) { payload["inventory_ids"].append(((LLTaskInvFVBridge*)item)->getUUID()); } - LLNotificationsUtil::add("RemoveItemWarn", LLSD(), payload, boost::bind(&remove_task_inventory_callback, _1, _2, mPanel)); + LLNotificationsUtil::add("CantModifyContentInNoModTask", LLSD(), payload, boost::bind(&remove_task_inventory_callback, _1, _2, mPanel)); } else { From 429a53eeee830c20b18fe76471d6f778da7e660a Mon Sep 17 00:00:00 2001 From: Hecklezz Date: Sat, 11 Oct 2025 23:18:49 +1000 Subject: [PATCH 2/2] Fixed allowing deleting no-mod content if tried to be deleted twice --- indra/newview/llpanelobjectinventory.cpp | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/indra/newview/llpanelobjectinventory.cpp b/indra/newview/llpanelobjectinventory.cpp index a8927c81eb2..a31a54bb670 100644 --- a/indra/newview/llpanelobjectinventory.cpp +++ b/indra/newview/llpanelobjectinventory.cpp @@ -385,10 +385,7 @@ bool LLTaskInvFVBridge::removeItem() return true; } - LLSD payload; - payload["task_id"] = mPanel->getTaskUUID(); - payload["inventory_ids"].append(mUUID); - LLNotificationsUtil::add("CantModifyContentInNoModTask", LLSD(), payload, boost::bind(&remove_task_inventory_callback, _1, _2, mPanel)); + LLNotificationsUtil::add("CantModifyContentInNoModTask"); return false; } } @@ -411,13 +408,7 @@ void LLTaskInvFVBridge::removeBatch(std::vector& batch) if (!object->permModify()) { - LLSD payload; - payload["task_id"] = mPanel->getTaskUUID(); - for (LLFolderViewModelItem* item : batch) - { - payload["inventory_ids"].append(((LLTaskInvFVBridge*)item)->getUUID()); - } - LLNotificationsUtil::add("CantModifyContentInNoModTask", LLSD(), payload, boost::bind(&remove_task_inventory_callback, _1, _2, mPanel)); + LLNotificationsUtil::add("CantModifyContentInNoModTask"); } else {