diff options
| author | Kelly Washington <kelly@lindenlab.com> | 2007-06-21 22:40:22 +0000 |
|---|---|---|
| committer | Kelly Washington <kelly@lindenlab.com> | 2007-06-21 22:40:22 +0000 |
| commit | e03bb0606a10f29c8b94909a713a5bb5c69e88b7 (patch) | |
| tree | 6d8d07894579438c8cc70e08f5730c3c95dfe768 /indra/newview/lltexlayer.h | |
| parent | 2638f12f95eea692502836cf6548b4a0b234d009 (diff) | |
merge -r62831:64079 branches/maintenance to release
Diffstat (limited to 'indra/newview/lltexlayer.h')
| -rw-r--r-- | indra/newview/lltexlayer.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/lltexlayer.h b/indra/newview/lltexlayer.h index bda865eb2e..1dd0f0b657 100644 --- a/indra/newview/lltexlayer.h +++ b/indra/newview/lltexlayer.h @@ -266,7 +266,7 @@ protected: typedef std::vector<LLTexLayer *> layer_list_t; layer_list_t mLayerList; LLTexLayerSetBuffer* mComposite; - LLVOAvatar* mAvatar; + LLPointer<LLVOAvatar> mAvatar; BOOL mUpdatesEnabled; BOOL mHasBump; @@ -423,7 +423,7 @@ public: protected: typedef std::vector<LLTexParamColor *> param_list_t; param_list_t mParamList; - LLVOAvatar* mAvatar; + LLPointer<LLVOAvatar> mAvatar; LLTexGlobalColorInfo *mInfo; }; @@ -469,7 +469,7 @@ protected: LLVector3 mAvgDistortionVec; LLTexGlobalColor* mTexGlobalColor; // either has mTexGlobalColor or mTexLayer as its parent LLTexLayer* mTexLayer; - LLVOAvatar* mAvatar; // redundant, but simplifies the code + LLPointer<LLVOAvatar> mAvatar; // redundant, but simplifies the code }; //----------------------------------------------------------------------------- @@ -549,7 +549,7 @@ public: ~LLBakedUploadData() {} LLUUID mID; - LLVOAvatar* mAvatar; + LLPointer<LLVOAvatar> mAvatar; LLTexLayerSetBuffer* mLayerSetBuffer; LLUUID mWearableAssets[WT_COUNT]; }; |