Merge branch 'master' of https://github.com/siana/SingularityViewer

2011-12-03 13:03:39 -05:00
parent 2565caf62a 40b4b47023
commit e08e8cf131
1 changed files with 0 additions and 2 deletions
--- a/indra/newview/llmeshrepository.cpp
+++ b/indra/newview/llmeshrepository.cpp
@@ -26,7 +26,6 @@

 #include "llviewerprecompiledheaders.h"

-#if MESH_ENABLED
 #include "apr_pools.h"
 #include "apr_dso.h"
 #include "llhttpstatuscodes.h"
@@ -3333,7 +3332,6 @@ void LLPhysicsDecomp::doDecompositionSingleHull()
 		completeCurrent();
 		
 	}
-#endif //MESH_IMPORT
 }