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

Conflicts: indra/newview/llspatialpartition.cpp
2011-08-05 19:40:35 -05:00
parent 7bcd259821 ef6737d0cd
commit 550fa0a160
77 changed files with 688 additions and 706 deletions
--- a/indra/llprimitive/llmodel.cpp
+++ b/indra/llprimitive/llmodel.cpp
@@ -1355,7 +1355,7 @@ LLModel* LLModel::loadModelFromDomMesh(domMesh *mesh)
 	ret->mLabel = getElementLabel(mesh);
 	return ret;
 }
-#endif MESH_IMPORT
+#endif //MESH_IMPORT

 std::string LLModel::getName() const
 {