SH-4128 WIP - misc cleanup

3 files changed, 4 insertions, 4 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);
diff --git a/indra/newview/llpaneleditwearable.cpp b/indra/newview/llpaneleditwearable.cpp
index 06c923273b..580e31591c 100755
--- a/indra/newview/llpaneleditwearable.cpp
+++ b/indra/newview/llpaneleditwearable.cpp
@@ -1113,7 +1113,7 @@ void LLPanelEditWearable::saveChanges(bool force_save_as)
 									 LLAssetType::AT_LINK,
 									 NULL);
 				// Remove old link
-				remove_inventory_item(link_item->getUUID());
+				remove_inventory_item(link_item->getUUID(), NULL);
 			}
 			gAgentWearables.saveWearable(mWearablePtr->getType(), index, TRUE, new_name);
         }
diff --git a/indra/newview/llviewerinventory.cpp b/indra/newview/llviewerinventory.cpp
index 316fca7769..06efeb86d9 100755
--- a/indra/newview/llviewerinventory.cpp
+++ b/indra/newview/llviewerinventory.cpp
@@ -1276,7 +1276,7 @@ void remove_inventory_item(
 	}
 	else
 	{
-		llwarns << "remove_inventory_item called for nonexistent item " << item_id << llendl;
+		llwarns << "remove_inventory_item called for invalid or nonexistent item " << item_id << llendl;
 	}
 }