diff options
| author | TJ <tj8@live.com.au> | 2025-10-13 22:37:23 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-10-13 15:37:23 +0300 |
| commit | 46b4ea4d6d256fb644369d8701cc80944be44800 (patch) | |
| tree | 84a0b9fe2e847f231609c2c8002e43005b21f75e | |
| parent | 2cdcd336ba63702cbf9919bebb279292edf9ba0e (diff) | |
#4811 #4813 Fixed RemoveItemWarn invalid notification and deleting no-mod content (#4812)
* Fixed trying to display an invalid notification for RemoveItemWarn
* Fixed allowing deleting no-mod content if tried to be deleted twice
| -rw-r--r-- | indra/newview/llpanelobjectinventory.cpp | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/indra/newview/llpanelobjectinventory.cpp b/indra/newview/llpanelobjectinventory.cpp index f90d6d5b3f..a31a54bb67 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("RemoveItemWarn", 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<LLFolderViewModelItem*>& batch) if (!object->permModify()) { - LLSD payload; - payload["task_id"] = mPanel->getTaskUUID(); - for (LLFolderViewModelItem* item : 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"); } else { |