diff options
| author | Don Kjer <don@lindenlab.com> | 2007-07-02 17:10:30 +0000 |
|---|---|---|
| committer | Don Kjer <don@lindenlab.com> | 2007-07-02 17:10:30 +0000 |
| commit | e5124431b54d4342d4677371fccca5bc7250c079 (patch) | |
| tree | 8c9636e78e93cef6ed099d9abd72ec9ccbbf35fe /indra/llmath | |
| parent | ce5e13630cd8f4174549a3ec4ae8c24eec90bb3d (diff) | |
svn merge -r 64079:64548 svn+ssh://svn/svn/linden/branches/maintenance into release
Diffstat (limited to 'indra/llmath')
| -rw-r--r-- | indra/llmath/llvolume.h | 2 | ||||
| -rw-r--r-- | indra/llmath/v4color.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/indra/llmath/llvolume.h b/indra/llmath/llvolume.h index a7d07bc712..2db44d39d1 100644 --- a/indra/llmath/llvolume.h +++ b/indra/llmath/llvolume.h @@ -822,7 +822,7 @@ public: U8 getPathType() const { return mPathp->mParams.getCurveType(); } S32 getNumFaces() const { return (S32)mProfilep->mFaces.size(); } S32 getNumVolumeFaces() const { return mNumVolumeFaces; } - const F32 getDetail() const { return mDetail; } + F32 getDetail() const { return mDetail; } const LLVolumeParams & getParams() const { return mParams; } LLVolumeParams getCopyOfParams() const { return mParams; } const LLProfile& getProfile() const { return *mProfilep; } diff --git a/indra/llmath/v4color.h b/indra/llmath/v4color.h index ef9c5d4769..13fdef3850 100644 --- a/indra/llmath/v4color.h +++ b/indra/llmath/v4color.h @@ -73,7 +73,7 @@ class LLColor4 F32 magVec() const; // Returns magnitude of LLColor4 F32 magVecSquared() const; // Returns magnitude squared of LLColor4 F32 normVec(); // Normalizes and returns the magnitude of LLColor4 - const BOOL isOpaque() { return mV[VALPHA] == 1.f; } + BOOL isOpaque() { return mV[VALPHA] == 1.f; } F32 operator[](int idx) const { return mV[idx]; } F32 &operator[](int idx) { return mV[idx]; } |