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.h9
1 files changed, 5 insertions, 4 deletions
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:
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 LLPointer<LLVOAvatar> mAvatar; 289 // Backlink only; don't make this an LLPointer.
290 LLVOAvatar* mAvatar;
290 BOOL mUpdatesEnabled; 291 BOOL mUpdatesEnabled;
291 BOOL mHasBump; 292 BOOL mHasBump;
292 293
@@ -443,7 +444,7 @@ public:
443protected: 444protected:
444 typedef std::vector<LLTexParamColor *> param_list_t; 445 typedef std::vector<LLTexParamColor *> param_list_t;
445 param_list_t mParamList; 446 param_list_t mParamList;
446 LLPointer<LLVOAvatar> mAvatar; 447 LLVOAvatar* mAvatar; // just backlink, don't LLPointer
447 448
448 LLTexGlobalColorInfo *mInfo; 449 LLTexGlobalColorInfo *mInfo;
449}; 450};
@@ -489,7 +490,7 @@ protected:
489 LLVector3 mAvgDistortionVec; 490 LLVector3 mAvgDistortionVec;
490 LLTexGlobalColor* mTexGlobalColor; // either has mTexGlobalColor or mTexLayer as its parent 491 LLTexGlobalColor* mTexGlobalColor; // either has mTexGlobalColor or mTexLayer as its parent
491 LLTexLayer* mTexLayer; 492 LLTexLayer* mTexLayer;
492 LLPointer<LLVOAvatar> mAvatar; // redundant, but simplifies the code 493 LLVOAvatar* mAvatar; // redundant, but simplifies the code (don't LLPointer)
493}; 494};
494 495
495//----------------------------------------------------------------------------- 496//-----------------------------------------------------------------------------
@@ -569,7 +570,7 @@ public:
569 ~LLBakedUploadData() {} 570 ~LLBakedUploadData() {}
570 571
571 LLUUID mID; 572 LLUUID mID;
572 LLPointer<LLVOAvatar> mAvatar; 573 LLVOAvatar* mAvatar; // just backlink, don't LLPointer
573 LLTexLayerSetBuffer* mLayerSetBuffer; 574 LLTexLayerSetBuffer* mLayerSetBuffer;
574 LLUUID mWearableAssets[WT_COUNT]; 575 LLUUID mWearableAssets[WT_COUNT];
575}; 576};