diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2012-03-20 15:23:42 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2012-03-20 15:23:42 -0400 |
| commit | cabb6b6a5f339a69fec25b836f46b8b470eebb90 (patch) | |
| tree | 7639aed6cb06bb0d9c3d52cb746d1c98f1120dbe /indra/llmath/llvolume.h | |
| parent | 739532ee4ffdd58f9d0999901340d5476533fec2 (diff) | |
| parent | 9d9ad9a876d6498a89f9aeefc9bf258e1674dae7 (diff) | |
Automated merge with http://hg.secondlife.com/viewer-release
Diffstat (limited to 'indra/llmath/llvolume.h')
| -rw-r--r-- | indra/llmath/llvolume.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/llmath/llvolume.h b/indra/llmath/llvolume.h index afd1ec5eed..76cf9de613 100644 --- a/indra/llmath/llvolume.h +++ b/indra/llmath/llvolume.h @@ -963,6 +963,7 @@ public: S32 getNumFaces() const; S32 getNumVolumeFaces() const { return mVolumeFaces.size(); } F32 getDetail() const { return mDetail; } + F32 getSurfaceArea() const { return mSurfaceArea; } const LLVolumeParams& getParams() const { return mParams; } LLVolumeParams getCopyOfParams() const { return mParams; } const LLProfile& getProfile() const { return *mProfilep; } @@ -1065,6 +1066,7 @@ public: BOOL mUnique; F32 mDetail; S32 mSculptLevel; + F32 mSurfaceArea; //unscaled surface area BOOL mIsMeshAssetLoaded; LLVolumeParams mParams; |