diff options
| author | callum_linden <callum@lindenlab.com> | 2017-12-11 10:09:44 -0800 |
|---|---|---|
| committer | callum_linden <callum@lindenlab.com> | 2017-12-11 10:09:44 -0800 |
| commit | 5561673bf1c98c717f69e747a9e8b0d56129ef12 (patch) | |
| tree | f021c5beca7aaad132c60d25881c7920a9944daf /indra/llmath/llvolume.h | |
| parent | fe29551d9a6685bdc40e87ae135f236aec1ea475 (diff) | |
| parent | c565c62745ec37484118888f8f45dbde34d42e46 (diff) | |
Automated merge with tip of viewer64 *plus* update to CEF 3.3202.1686 / Dullahan 901
Diffstat (limited to 'indra/llmath/llvolume.h')
| -rw-r--r-- | indra/llmath/llvolume.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/llmath/llvolume.h b/indra/llmath/llvolume.h index bf81c978a0..bba691d243 100644 --- a/indra/llmath/llvolume.h +++ b/indra/llmath/llvolume.h @@ -681,6 +681,8 @@ protected: class LLProfile { + friend class LLVolume; + public: LLProfile() : mOpen(FALSE), @@ -691,8 +693,6 @@ public: { } - ~LLProfile(); - S32 getTotal() const { return mTotal; } S32 getTotalOut() const { return mTotalOut; } // Total number of outside points BOOL isFlat(S32 face) const { return (mFaces[face].mCount == 2); } @@ -725,6 +725,8 @@ public: friend std::ostream& operator<<(std::ostream &s, const LLProfile &profile); protected: + ~LLProfile(); + static S32 getNumNGonPoints(const LLProfileParams& params, S32 sides, F32 offset=0.0f, F32 bevel = 0.0f, F32 ang_scale = 1.f, S32 split = 0); void genNGon(const LLProfileParams& params, S32 sides, F32 offset=0.0f, F32 bevel = 0.0f, F32 ang_scale = 1.f, S32 split = 0); |