summaryrefslogtreecommitdiff
path: root/indra/llmath/llvolume.h
diff options
context:
space:
mode:
authorNyx (Neal Orman) <nyx@lindenlab.com>2011-08-18 19:17:34 -0400
committerNyx (Neal Orman) <nyx@lindenlab.com>2011-08-18 19:17:34 -0400
commitcb09994ae2a3d1d60a6554fea4c6a604b867c6eb (patch)
tree676b7c68e0b0422c63e4cb6dbd5ccc1e55168e2f /indra/llmath/llvolume.h
parentcfe0a3cbe445900574b82e8c843bddc347f1b269 (diff)
parent299a01470402de0327fc7f839e5937fc6b60bf63 (diff)
merging in latest mesh-development
Diffstat (limited to 'indra/llmath/llvolume.h')
-rw-r--r--indra/llmath/llvolume.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/llmath/llvolume.h b/indra/llmath/llvolume.h
index f67f8f644d..f0e59a3c00 100644
--- a/indra/llmath/llvolume.h
+++ b/indra/llmath/llvolume.h
@@ -1058,14 +1058,14 @@ protected:
public:
virtual bool unpackVolumeFaces(std::istream& is, S32 size);
- virtual void makeTetrahedron();
- virtual BOOL isTetrahedron();
+ virtual void setMeshAssetLoaded(BOOL loaded);
+ virtual BOOL isMeshAssetLoaded();
protected:
BOOL mUnique;
F32 mDetail;
S32 mSculptLevel;
- BOOL mIsTetrahedron;
+ BOOL mIsMeshAssetLoaded;
LLVolumeParams mParams;
LLPath *mPathp;