diff options
| author | Richard Nelson <richard@lindenlab.com> | 2011-10-05 13:01:57 -0700 |
|---|---|---|
| committer | Richard Nelson <richard@lindenlab.com> | 2011-10-05 13:01:57 -0700 |
| commit | 7ffa6ba854392d5c37de8631c7f35edeed375a58 (patch) | |
| tree | 8ca3d2ff39b8ec870ebdf264bf7a26a67f7df624 /indra/llmath/llvolume.h | |
| parent | ba60e0906549840b8632d72f17b3f9bcda65e882 (diff) | |
| parent | e61da057397f95e0dcf8bf964e2836d3d4a80c20 (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience-fui
Diffstat (limited to 'indra/llmath/llvolume.h')
| -rw-r--r-- | indra/llmath/llvolume.h | 6 |
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; |