aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/lltexlayer.h
diff options
context:
space:
mode:
Diffstat (limited to 'linden/indra/newview/lltexlayer.h')
-rw-r--r--linden/indra/newview/lltexlayer.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/linden/indra/newview/lltexlayer.h b/linden/indra/newview/lltexlayer.h
index c5a34a6..920ae4a 100644
--- a/linden/indra/newview/lltexlayer.h
+++ b/linden/indra/newview/lltexlayer.h
@@ -286,7 +286,7 @@ protected:
286 typedef std::vector<LLTexLayer *> layer_list_t; 286 typedef std::vector<LLTexLayer *> layer_list_t;
287 layer_list_t mLayerList; 287 layer_list_t mLayerList;
288 LLTexLayerSetBuffer* mComposite; 288 LLTexLayerSetBuffer* mComposite;
289 LLVOAvatar* mAvatar; 289 LLPointer<LLVOAvatar> mAvatar;
290 BOOL mUpdatesEnabled; 290 BOOL mUpdatesEnabled;
291 BOOL mHasBump; 291 BOOL mHasBump;
292 292
@@ -443,7 +443,7 @@ public:
443protected: 443protected:
444 typedef std::vector<LLTexParamColor *> param_list_t; 444 typedef std::vector<LLTexParamColor *> param_list_t;
445 param_list_t mParamList; 445 param_list_t mParamList;
446 LLVOAvatar* mAvatar; 446 LLPointer<LLVOAvatar> mAvatar;
447 447
448 LLTexGlobalColorInfo *mInfo; 448 LLTexGlobalColorInfo *mInfo;
449}; 449};
@@ -489,7 +489,7 @@ protected:
489 LLVector3 mAvgDistortionVec; 489 LLVector3 mAvgDistortionVec;
490 LLTexGlobalColor* mTexGlobalColor; // either has mTexGlobalColor or mTexLayer as its parent 490 LLTexGlobalColor* mTexGlobalColor; // either has mTexGlobalColor or mTexLayer as its parent
491 LLTexLayer* mTexLayer; 491 LLTexLayer* mTexLayer;
492 LLVOAvatar* mAvatar; // redundant, but simplifies the code 492 LLPointer<LLVOAvatar> mAvatar; // redundant, but simplifies the code
493}; 493};
494 494
495//----------------------------------------------------------------------------- 495//-----------------------------------------------------------------------------
@@ -569,7 +569,7 @@ public:
569 ~LLBakedUploadData() {} 569 ~LLBakedUploadData() {}
570 570
571 LLUUID mID; 571 LLUUID mID;
572 LLVOAvatar* mAvatar; 572 LLPointer<LLVOAvatar> mAvatar;
573 LLTexLayerSetBuffer* mLayerSetBuffer; 573 LLTexLayerSetBuffer* mLayerSetBuffer;
574 LLUUID mWearableAssets[WT_COUNT]; 574 LLUUID mWearableAssets[WT_COUNT];
575}; 575};