diff options
author | Dave Parks <davep@lindenlab.com> | 2012-05-21 23:34:51 -0500 |
---|---|---|
committer | Dave Parks <davep@lindenlab.com> | 2012-05-21 23:34:51 -0500 |
commit | 336b12e803fdc5f34b5394eae50645870d664d13 (patch) | |
tree | d922b43194da6e45bf648cadcaf49b6e07a9bf89 /indra/llmath | |
parent | 430d384a93284c87b4e8af5d3bfacbf7e22094bf (diff) | |
parent | b44eb2e7a910e65373dfed54b86aff87ddda918d (diff) |
merge
Diffstat (limited to 'indra/llmath')
-rw-r--r-- | indra/llmath/llvolume.h | 5 |
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 |