livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

#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
master
TJ 2025-10-13 22:37:23 +10:00 committed by GitHub
parent 2cdcd336ba
commit 46b4ea4d6d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
indra/newview/llpanelobjectinventory.cpp
View File

@ -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
{