Merge branch 'V2MultiWear' of bitbucket.org:Lirusaito/singularityviewer into AltCompilers

Conflicts:
	indra/cmake/00-Common.cmake
	indra/newview/llvovolume.cpp

indra/llmath/llvolume.h

@@ -60,6 +60,7 @@ class LLVolumeTriangle;
 #include "llstrider.h"
 #include "v4coloru.h"
 #include "llrefcount.h"
+#include "llpointer.h"
 #include "llfile.h"
 
 //============================================================================
@@ -926,6 +927,10 @@ public:
 	LLVector2*  mTexCoords;
 	U16* mIndices;
 
+	//vertex buffer filled in by LLFace to cache this volume face geometry in vram 
+	// (declared as a LLPointer to LLRefCount to avoid dependency on LLVertexBuffer)
+	mutable LLPointer<LLRefCount> mVertexBuffer; 
+
 	std::vector<S32>	mEdge;
 
 	//list of skin weights for rigged volumes