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

SH-4128 WIP - avoid needless called to updateLinkedObjectsFromPurge()

meow-7.2.2
Brad Payne (Vir Linden) 2013-04-18 17:31:35 -04:00
parent 17af76fae1
commit e3ceb10c48
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
indra/newview/llinventorymodel.cpp Normal file → Executable file
View File

@ -1171,8 +1171,14 @@ void LLInventoryModel::deleteObject(const LLUUID& id)
mParentChildCategoryTree.erase(id);
}
addChangedMask(LLInventoryObserver::REMOVE, id);
bool is_link_type = obj->getIsLinkType();
obj = NULL; // delete obj
updateLinkedObjectsFromPurge(id);
// Can't have links to links, so there's no need for this update
// if the item removed is a link.
if (!is_link_type)
{
updateLinkedObjectsFromPurge(id);
}
gInventory.notifyObservers();
}