From 52f3f70ce887c0f8877de7a8439bf44a246e7f9a Mon Sep 17 00:00:00 2001
From: Nicky <nicky.dasmijn@posteo.nl>
Date: Wed, 10 Apr 2024 20:44:24 +0200
Subject: Make sure items get removed from maps before the item itself gets
 destroyed, Otherwise the viewer ends with a dangling pointer in the map

---
 indra/newview/llinventorypanel.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/indra/newview/llinventorypanel.cpp b/indra/newview/llinventorypanel.cpp
index ab04a8589a..ae2236da3f 100644
--- a/indra/newview/llinventorypanel.cpp
+++ b/indra/newview/llinventorypanel.cpp
@@ -578,8 +578,8 @@ void LLInventoryPanel::itemChanged(const LLUUID& item_id, U32 mask, const LLInve
 		if (model_item && view_item && viewmodel_item)
 		{
 			const LLUUID& idp = viewmodel_item->getUUID();
+            removeItemID(idp);
 			view_item->destroyView();
-			removeItemID(idp);
 		}
 
         LLInventoryObject const* objectp = mInventory->getObject(item_id);
-- 
cgit v1.2.3