EXT-7991 FIX Crash if exit before outfit autopopulate completes

reviewed by Leyla

1 files changed, 15 insertions, 0 deletions

diff --git a/indra/newview/llviewerinventory.cpp b/indra/newview/llviewerinventory.cpp
index 3430f265ae..2bf05d5907 100644
--- a/indra/newview/llviewerinventory.cpp
+++ b/indra/newview/llviewerinventory.cpp
@@ -839,6 +839,21 @@ LLInventoryCallbackManager::~LLInventoryCallbackManager()
 	sInstance = NULL;
 }
 
+//static 
+void LLInventoryCallbackManager::destroyClass()
+{
+	if (sInstance)
+	{
+		for (callback_map_t::iterator it = sInstance->mMap.begin(), end_it = sInstance->mMap.end(); it != end_it; ++it)
+		{
+			// drop LLPointer reference to callback
+			it->second = NULL;
+		}
+		sInstance->mMap.clear();
+	}
+}
+
+
 U32 LLInventoryCallbackManager::registerCB(LLPointer<LLInventoryCallback> cb)
 {
 	if (cb.isNull())