diff options
author | Steven Bennetts <steve@lindenlab.com> | 2007-03-02 21:25:50 +0000 |
---|---|---|
committer | Steven Bennetts <steve@lindenlab.com> | 2007-03-02 21:25:50 +0000 |
commit | 4dabd9c0472deb49573fdafef2fa413e59703f19 (patch) | |
tree | 06c680d6a2047e03838d6548bccd26c7baf9d652 /indra/llmath/llvolume.h | |
parent | d4462963c6ba5db2088723bbedc7b60f1184c594 (diff) |
merge release@58699 beta-1-14-0@58707 -> release
Diffstat (limited to 'indra/llmath/llvolume.h')
-rw-r--r-- | indra/llmath/llvolume.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/llmath/llvolume.h b/indra/llmath/llvolume.h index cf9ae00f21..97aeeb9589 100644 --- a/indra/llmath/llvolume.h +++ b/indra/llmath/llvolume.h @@ -756,6 +756,8 @@ public: S32 mNumS; S32 mNumT; + LLVector3 mExtents[2]; //minimum and maximum point of face + std::vector<VertexData> mVertices; std::vector<S32> mIndices; std::vector<S32> mEdge; @@ -849,7 +851,6 @@ public: const LLVolumeFace &getVolumeFace(const S32 f) const {return mVolumeFaces[f];} // DO NOT DELETE VOLUME WHILE USING THIS REFERENCE, OR HOLD A POINTER TO THIS VOLUMEFACE U32 mFaceMask; // bit array of which faces exist in this volume - LLVector3 mBounds[2]; // bounding box (center, half-height) LLVector3 mLODScaleBias; // vector for biasing LOD based on scale protected: |