diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2007-03-07 01:13:34 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2007-03-07 01:13:34 +0000 |
| commit | 3d17ddd38baa9fd862114e6f90ce3ce809780b4f (patch) | |
| tree | 7ce1dfa01476b55b1aa8fed5c4e3b25b429cdc23 /indra/newview/llvovolume.h | |
| parent | efcd347c80458f3b18284a1250bef7ef7ea5a325 (diff) | |
merge -r 58751:58843 maintenance -> release
Diffstat (limited to 'indra/newview/llvovolume.h')
| -rw-r--r-- | indra/newview/llvovolume.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/indra/newview/llvovolume.h b/indra/newview/llvovolume.h index f36c367f52..3eb8ad6c14 100644 --- a/indra/newview/llvovolume.h +++ b/indra/newview/llvovolume.h @@ -85,7 +85,6 @@ public: const LLVector3 getPivotPositionAgent() const; const LLMatrix4& getRelativeXform() const { return mRelativeXform; } const LLMatrix3& getRelativeXformInvTrans() const { return mRelativeXformInvTrans; } - const LLMatrix4* getTextureMatrix() const { return &mTextureMatrix; } /*virtual*/ const LLMatrix4 getRenderMatrix() const; /*virtual*/ BOOL lineSegmentIntersect(const LLVector3& start, LLVector3& end) const; @@ -194,7 +193,6 @@ protected: public: LLViewerTextureAnim *mTextureAnimp; U8 mTexAnimMode; - protected: friend class LLDrawable; @@ -205,7 +203,6 @@ protected: S32 mLOD; BOOL mLODChanged; F32 mRadius; - LLMatrix4 mTextureMatrix; LLMatrix4 mRelativeXform; LLMatrix3 mRelativeXformInvTrans; BOOL mVolumeChanged; |