3 files changed, 0 insertions, 36 deletions
diff --git a/indra/newview/llmeshrepository.cpp b/indra/newview/llmeshrepository.cpp
index 2ca94390e5..61ccd355a1 100644
--- a/indra/newview/llmeshrepository.cpp
+++ b/indra/newview/llmeshrepository.cpp
@@ -3651,38 +3651,6 @@ S32 LLMeshRepository::update()
     return static_cast<S32>(size);
 }
 
-#ifdef SHOW_ASSERT
-// Brute-force remove the object from all loading queues. Returns true if
-// something was removed.
-// This function is used in a debug assert to ensure unregisterMesh and
-// unregisterSkinInfo are called as intended.
-// *TODO: Consider removing at some point if we feel confident about the code
-// working as intended.
-bool LLMeshRepository::forceUnregisterMesh(LLVOVolume* vobj)
-{
-    LL_PROFILE_ZONE_SCOPED_CATEGORY_VOLUME;
-
-    bool found = false;
-
-    for (auto& lod : mLoadingMeshes)
-    {
-        for (auto& param : lod)
-        {
-            llassert(std::find(param.second.begin(), param.second.end(), vobj) == param.second.end());
-            found = found || vector_replace_with_last(param.second, vobj);
-        }
-    }
-
-    for (auto& skin_pair : mLoadingSkins)
-    {
-        llassert(std::find(skin_pair.second.begin(), skin_pair.second.end(), vobj) == skin_pair.second.end());
-        found = found || vector_replace_with_last(skin_pair.second, vobj);
-    }
-
-    return found;
-}
-#endif
-
 void LLMeshRepository::unregisterMesh(LLVOVolume* vobj, const LLVolumeParams& mesh_params, S32 detail)
 {
     LL_PROFILE_ZONE_SCOPED_CATEGORY_VOLUME;
diff --git a/indra/newview/llmeshrepository.h b/indra/newview/llmeshrepository.h
index b8bec7f233..6e10493e90 100644
--- a/indra/newview/llmeshrepository.h
+++ b/indra/newview/llmeshrepository.h
@@ -636,9 +636,6 @@ public:
     void shutdown();
     S32 update();
 
-#ifdef SHOW_ASSERT
-    bool forceUnregisterMesh(LLVOVolume* volume);
-#endif
     void unregisterMesh(LLVOVolume* vobj, const LLVolumeParams& mesh_params, S32 detail);
     void unregisterSkinInfo(const LLUUID& mesh_id, LLVOVolume* vobj);
     //mesh management functions
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp
index 2f2054355a..e1eface4e8 100644
--- a/indra/newview/llvovolume.cpp
+++ b/indra/newview/llvovolume.cpp
@@ -251,7 +251,6 @@ LLVOVolume::~LLVOVolume()
     mVolumeImpl = NULL;
 
     unregisterOldMeshAndSkin();
-    llassert(!gMeshRepo.forceUnregisterMesh(this));
 
     if(!mMediaImplList.empty())
     {