From 3d17ddd38baa9fd862114e6f90ce3ce809780b4f Mon Sep 17 00:00:00 2001
From: Steven Bennetts <steve@lindenlab.com>
Date: Wed, 7 Mar 2007 01:13:34 +0000
Subject: merge -r 58751:58843 maintenance -> release

---
 indra/newview/llvovolume.h | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'indra/newview/llvovolume.h')

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;
-- 
cgit v1.2.3