diff options
| author | callum_linden <none@none> | 2015-09-29 13:03:51 -0700 |
|---|---|---|
| committer | callum_linden <none@none> | 2015-09-29 13:03:51 -0700 |
| commit | 11c188dc734fd1dc921a2fa4c14e89a0e190c26b (patch) | |
| tree | 3b2f16cdc2ebfcc30d30a28030a9aafb6eae0c58 /indra/llmath/llvolume.h | |
| parent | 3e20770f350652b91fd4b4a5bbef9b5f03561310 (diff) | |
| parent | 2d52b62e67cf46222396c724d00d2de874819197 (diff) | |
Merge with viewer-release (DRTVWR-368)
Diffstat (limited to 'indra/llmath/llvolume.h')
| -rwxr-xr-x | indra/llmath/llvolume.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/llmath/llvolume.h b/indra/llmath/llvolume.h index c8476f6897..625f7cff02 100755 --- a/indra/llmath/llvolume.h +++ b/indra/llmath/llvolume.h @@ -968,6 +968,7 @@ protected: ~LLVolume(); // use unref public: + typedef std::vector<LLVolumeFace> face_list_t; struct FaceParams { @@ -1041,6 +1042,10 @@ public: // conversion if *(LLVolume*) to LLVolume& 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 + LLVolumeFace &getVolumeFace(const S32 f) {return mVolumeFaces[f];} // DO NOT DELETE VOLUME WHILE USING THIS REFERENCE, OR HOLD A POINTER TO THIS VOLUMEFACE + + face_list_t& getVolumeFaces() { return mVolumeFaces; } + U32 mFaceMask; // bit array of which faces exist in this volume LLVector3 mLODScaleBias; // vector for biasing LOD based on scale @@ -1080,7 +1085,6 @@ public: BOOL mGenerateSingleFace; - typedef std::vector<LLVolumeFace> face_list_t; face_list_t mVolumeFaces; public: |