From 28d8d4e7664bcd6c8369cc18832e42096af7cad2 Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Fri, 15 Aug 2008 23:45:01 -0500
Subject: Second Life viewer sources 1.17.3.0

---
 linden/indra/newview/lltexlayer.h | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'linden/indra/newview/lltexlayer.h')

diff --git a/linden/indra/newview/lltexlayer.h b/linden/indra/newview/lltexlayer.h
index 920ae4a..7d517ee 100644
--- a/linden/indra/newview/lltexlayer.h
+++ b/linden/indra/newview/lltexlayer.h
@@ -286,7 +286,8 @@ protected:
 	typedef std::vector<LLTexLayer *> layer_list_t;
 	layer_list_t			mLayerList;
 	LLTexLayerSetBuffer*	mComposite;
-	LLPointer<LLVOAvatar>	mAvatar;
+	// Backlink only; don't make this an LLPointer.
+	LLVOAvatar*				mAvatar;
 	BOOL					mUpdatesEnabled;
 	BOOL					mHasBump;
 
@@ -443,7 +444,7 @@ public:
 protected:
 	typedef std::vector<LLTexParamColor *> param_list_t;
 	param_list_t			mParamList;
-	LLPointer<LLVOAvatar>	mAvatar;
+	LLVOAvatar*				mAvatar;  // just backlink, don't LLPointer 
 
 	LLTexGlobalColorInfo	*mInfo;
 };
@@ -489,7 +490,7 @@ protected:
 	LLVector3				mAvgDistortionVec;
 	LLTexGlobalColor*		mTexGlobalColor;	// either has mTexGlobalColor or mTexLayer as its parent
 	LLTexLayer*				mTexLayer;
-	LLPointer<LLVOAvatar>	mAvatar;			// redundant, but simplifies the code
+	LLVOAvatar*				mAvatar;			// redundant, but simplifies the code (don't LLPointer)
 };
 
 //-----------------------------------------------------------------------------
@@ -569,7 +570,7 @@ public:
 	~LLBakedUploadData() {}
 
 	LLUUID					mID;
-	LLPointer<LLVOAvatar>	mAvatar;
+	LLVOAvatar*				mAvatar;	 // just backlink, don't LLPointer 
 	LLTexLayerSetBuffer*	mLayerSetBuffer;
 	LLUUID					mWearableAssets[WT_COUNT];
 };
-- 
cgit v1.1