diff options
| author | Don Kjer <don@lindenlab.com> | 2007-07-02 17:10:30 +0000 |
|---|---|---|
| committer | Don Kjer <don@lindenlab.com> | 2007-07-02 17:10:30 +0000 |
| commit | e5124431b54d4342d4677371fccca5bc7250c079 (patch) | |
| tree | 8c9636e78e93cef6ed099d9abd72ec9ccbbf35fe /indra/newview/lltexlayer.h | |
| parent | ce5e13630cd8f4174549a3ec4ae8c24eec90bb3d (diff) | |
svn merge -r 64079:64548 svn+ssh://svn/svn/linden/branches/maintenance into release
Diffstat (limited to 'indra/newview/lltexlayer.h')
| -rw-r--r-- | indra/newview/lltexlayer.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/indra/newview/lltexlayer.h b/indra/newview/lltexlayer.h index 1dd0f0b657..d60d4eab6c 100644 --- a/indra/newview/lltexlayer.h +++ b/indra/newview/lltexlayer.h @@ -266,7 +266,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; @@ -423,7 +424,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; }; @@ -469,7 +470,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) }; //----------------------------------------------------------------------------- @@ -549,7 +550,7 @@ public: ~LLBakedUploadData() {} LLUUID mID; - LLPointer<LLVOAvatar> mAvatar; + LLVOAvatar* mAvatar; // just backlink, don't LLPointer LLTexLayerSetBuffer* mLayerSetBuffer; LLUUID mWearableAssets[WT_COUNT]; }; |