Merge branch 'V2Mesh' of https://github.com/Shyotl/SingularityViewer into future

2011-08-01 19:56:33 +02:00
parent fcd37f3a45 0bd444de5f
commit aa469d860f
131 changed files with 18142 additions and 1761 deletions
--- a/indra/cmake/00-Common.cmake
+++ b/indra/cmake/00-Common.cmake
@@ -295,6 +295,7 @@ endif (STANDALONE)

 if(1 EQUAL 1)
 	add_definitions(-DOPENSIM_RULES=1)
+	add_definitions(-DMESH_ENABLED=1)
 endif(1 EQUAL 1)

 if(SERVER)