From d73588eaddb1ada6ac896850c3aa9d25307e076a Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Wed, 24 Apr 2013 18:38:40 -0400
Subject: SH-4128 WIP - misc cleanup

---
 indra/newview/llinventorymodel.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'indra/newview/llinventorymodel.cpp')

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);
-- 
cgit v1.2.3