diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2013-04-24 18:38:40 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2013-04-24 18:38:40 -0400 |
| commit | d73588eaddb1ada6ac896850c3aa9d25307e076a (patch) | |
| tree | 83b87d0664384093c6103dd15fc0a4373750162f /indra/newview/llinventorymodel.cpp | |
| parent | eb88e4d37850a48132193d332fa8945d3932369b (diff) | |
SH-4128 WIP - misc cleanup
Diffstat (limited to 'indra/newview/llinventorymodel.cpp')
| -rwxr-xr-x | indra/newview/llinventorymodel.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llinventorymodel.cpp b/indra/newview/llinventorymodel.cpp index bc327b8359..a0b9e7b0ec 100755 --- a/indra/newview/llinventorymodel.cpp +++ b/indra/newview/llinventorymodel.cpp @@ -1178,11 +1178,11 @@ void LLInventoryModel::deleteObject(const LLUUID& id) mParentChildCategoryTree.erase(id); } addChangedMask(LLInventoryObserver::REMOVE, id); - obj = NULL; // delete obj - + // Can't have links to links, so there's no need for this update // if the item removed is a link. bool is_link_type = obj->getIsLinkType(); + obj = NULL; // delete obj if (!is_link_type) { updateLinkedObjectsFromPurge(id); |