summaryrefslogtreecommitdiff
path: root/indra/llmath
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2012-06-22 14:04:33 -0500
committerDave Parks <davep@lindenlab.com>2012-06-22 14:04:33 -0500
commit9e9d32de384b2807f195be48f49fbdec725f45d1 (patch)
tree802158bd1a8872500ffeee286256f4c3ff79ef72 /indra/llmath
parent3c276c87bde4ff9403df93434e8dc5309a3441b9 (diff)
parentdefbd61d318d0da12fdea208cf2b2297d9a6b122 (diff)
merge
Diffstat (limited to 'indra/llmath')
-rw-r--r--indra/llmath/llvolume.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/llmath/llvolume.h b/indra/llmath/llvolume.h
index 76cf9de613..2e6f9e2f71 100644
--- a/indra/llmath/llvolume.h
+++ b/indra/llmath/llvolume.h
@@ -54,6 +54,7 @@ class LLVolumeTriangle;
#include "llstrider.h"
#include "v4coloru.h"
#include "llrefcount.h"
+#include "llpointer.h"
#include "llfile.h"
//============================================================================
@@ -919,6 +920,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