diff --git a/indra/newview/llmeshrepository.cpp b/indra/newview/llmeshrepository.cpp
index 1a88cdd720b4912c3b570216f38a176de6b685bd..00bf76019aec8df72a306bac2ca9dbe46946f74b 100644
--- a/indra/newview/llmeshrepository.cpp
+++ b/indra/newview/llmeshrepository.cpp
@@ -874,11 +874,11 @@ LLMeshRepoThread::~LLMeshRepoThread()
 
 void LLMeshRepoThread::run()
 {
-	/*LLCDResult res = */LLConvexDecomposition::initThread();
-	//if (res != LLCD_OK && LLConvexDecomposition::isFunctional())
-	//{
-	//	LL_WARNS(LOG_MESH) << "Convex decomposition unable to be loaded.  Expect severe problems." << LL_ENDL;
-	//}
+	LLCDResult res = LLConvexDecomposition::initThread();
+	if (res != LLCD_OK && LLConvexDecomposition::isFunctional())
+	{
+		LL_WARNS(LOG_MESH) << "Convex decomposition unable to be loaded.  Expect severe problems." << LL_ENDL;
+	}
 
 	while (!LLApp::isExiting())
 	{
@@ -1134,11 +1134,11 @@ void LLMeshRepoThread::run()
 		mSignal->unlock();
 	}
 
-	/*res = */LLConvexDecomposition::quitThread();
-	//if (res != LLCD_OK && LLConvexDecomposition::isFunctional())
-	//{
-	//	LL_WARNS(LOG_MESH) << "Convex decomposition unable to be quit." << LL_ENDL;
-	//}
+	res = LLConvexDecomposition::quitThread();
+	if (res != LLCD_OK && LLConvexDecomposition::isFunctional())
+	{
+		LL_WARNS(LOG_MESH) << "Convex decomposition unable to be quit." << LL_ENDL;
+	}
 }
 
 // Mutex:  LLMeshRepoThread::mMutex must be held on entry
@@ -3394,10 +3394,10 @@ void LLMeshRepository::init()
 	
 	LLConvexDecomposition::getInstance()->initSystem();
 
-    //if (!LLConvexDecomposition::isFunctional())
-    //{
-    //    LL_INFOS(LOG_MESH) << "Using STUB for LLConvexDecomposition" << LL_ENDL;
-    //}
+    if (!LLConvexDecomposition::isFunctional())
+    {
+        LL_INFOS(LOG_MESH) << "Using STUB for LLConvexDecomposition" << LL_ENDL;
+    }
 
 	mDecompThread = new LLPhysicsDecomp();
 	mDecompThread->start();