summaryrefslogtreecommitdiff
path: root/indra/llmath/llvolume.h
diff options
context:
space:
mode:
authorLogan Dethrow <log@lindenlab.com>2011-09-26 13:08:13 -0400
committerLogan Dethrow <log@lindenlab.com>2011-09-26 13:08:13 -0400
commit1ead58914837f12e943ff1db4b71cd3ed379d01c (patch)
treedbb6678b4b519e543deb3c344174888b99b4ccd7 /indra/llmath/llvolume.h
parent5b7b3cbbbbec439880a33af8944d10c7bb527c3a (diff)
parentd475a96e94be90e68cf34bf6c25d8ab259aa47b5 (diff)
Merge
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;