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

SL-19857 Exception at category creation

meow-7.2.2
Andrey Kleshchev 2023-06-13 22:41:49 +03:00
parent 19ed999be0
commit 14eadadf99
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
indra/newview/llinventorymodel.cpp
View File

@ -1031,13 +1031,14 @@ void LLInventoryModel::createNewCategory(const LLUUID& parent_id,
{
if (new_category.isNull())
{
if (callback)
if (callback && !callback.empty())
{
callback(new_category);
}
return;
}
// todo: not needed since AIS does the accounting?
LLViewerInventoryCategory* folderp = gInventory.getCategory(new_category);
if (!folderp)
{
@ -1057,7 +1058,7 @@ void LLInventoryModel::createNewCategory(const LLUUID& parent_id,
updateCategory(cat);
}
if (callback)
if (callback && !callback.empty())
{
callback(new_category);
}

2
indra/newview/llviewerinventory.cpp
View File

@ -1766,7 +1766,7 @@ void menu_create_inventory_item(LLInventoryPanel* panel, LLUUID dest_id, const L
if (panel)
{
LLHandle<LLPanel> handle = panel->getHandle();
std::function<void(const LLUUID&)> callback_cat_created = [handle](const LLUUID& new_category_id)
callback_cat_created = [handle](const LLUUID& new_category_id)
{
gInventory.notifyObservers();
LLInventoryPanel* panel = static_cast<LLInventoryPanel*>(handle.get());