MAINT-6119 Viewer needs a few NULL uuid checks

2 files changed, 11 insertions, 0 deletions

diff --git a/indra/newview/llinventorymodel.cpp b/indra/newview/llinventorymodel.cpp
index e123a3e68a..1ae8fc418f 100755
--- a/indra/newview/llinventorymodel.cpp
+++ b/indra/newview/llinventorymodel.cpp
@@ -3418,6 +3418,11 @@ void LLInventoryModel::removeCategory(const LLUUID& category_id)
 
 void LLInventoryModel::removeObject(const LLUUID& object_id)
 {
+	if(object_id.isNull())
+	{
+		return;
+	}
+
 	LLInventoryObject* obj = getObject(object_id);
 	if (dynamic_cast<LLViewerInventoryItem*>(obj))
 	{
diff --git a/indra/newview/llinventoryobserver.cpp b/indra/newview/llinventoryobserver.cpp
index d81401b59b..9480dfdc4d 100755
--- a/indra/newview/llinventoryobserver.cpp
+++ b/indra/newview/llinventoryobserver.cpp
@@ -306,6 +306,12 @@ void LLInventoryFetchItemsObserver::startFetch()
 			continue;
 		}
 
+		if ((*it).isNull())
+		{
+			LL_WARNS("Inventory") << "Skip fetching for a NULL uuid" << LL_ENDL;
+			continue;
+		}
+
 		// It's incomplete, so put it on the incomplete container, and
 		// pack this on the message.
 		mIncomplete.push_back(*it);