diff options
author | Stinson Linden <stinson@lindenlab.com> | 2014-05-23 21:56:44 +0100 |
---|---|---|
committer | Stinson Linden <stinson@lindenlab.com> | 2014-05-23 21:56:44 +0100 |
commit | 0160c514c5e0bc3e575b33ef27924a9c8c7c30cf (patch) | |
tree | cd181ea27a9193911ed6f3904345af4871464bcc /indra/llappearance/lltexlayerparams.h | |
parent | a13d2f7f706bc8d5a4ea103cde56bacea1dd82cc (diff) |
MAINT-4077: Refactoring to add copy constructors to the LLVisualParam class and all of its derived descendants in order to clarify ownership of memory pointers.
Diffstat (limited to 'indra/llappearance/lltexlayerparams.h')
-rw-r--r-- | indra/llappearance/lltexlayerparams.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/llappearance/lltexlayerparams.h b/indra/llappearance/lltexlayerparams.h index b38d28d3eb..68c67784e3 100644 --- a/indra/llappearance/lltexlayerparams.h +++ b/indra/llappearance/lltexlayerparams.h @@ -52,6 +52,8 @@ public: /*virtual*/ LLViewerVisualParam* cloneParam(LLWearable* wearable) const = 0; protected: + LLTexLayerParam(const LLTexLayerParam& pOther); + LLTexLayerInterface* mTexLayer; LLAvatarAppearance* mAvatarAppearance; }; @@ -102,6 +104,8 @@ public: BOOL getMultiplyBlend() const; private: + LLTexLayerParamAlpha(const LLTexLayerParamAlpha& pOther); + LLPointer<LLGLTexture> mCachedProcessedTexture; LLPointer<LLImageTGA> mStaticImageTGA; LLPointer<LLImageRaw> mStaticImageRaw; @@ -190,6 +194,8 @@ public: // New functions LLColor4 getNetColor() const; protected: + LLTexLayerParamColor(const LLTexLayerParamColor& pOther); + virtual void onGlobalColorChanged(bool upload_bake) {} private: LL_ALIGN_16(LLVector4a mAvgDistortionVec); |