From 36bb33b12ab090e2acbc7e00039cdff682882fa4 Mon Sep 17 00:00:00 2001 From: "Brad Payne (Vir Linden)" Date: Wed, 18 Sep 2013 17:03:34 -0400 Subject: sunshine cleanup annotations --- indra/llappearance/lltexlayerparams.h | 4 ++++ 1 file changed, 4 insertions(+) mode change 100644 => 100755 indra/llappearance/lltexlayerparams.h (limited to 'indra/llappearance/lltexlayerparams.h') diff --git a/indra/llappearance/lltexlayerparams.h b/indra/llappearance/lltexlayerparams.h old mode 100644 new mode 100755 index b38d28d3eb..c1ea8a9fb6 --- a/indra/llappearance/lltexlayerparams.h +++ b/indra/llappearance/lltexlayerparams.h @@ -83,8 +83,11 @@ public: // LLVisualParam Virtual functions ///*virtual*/ BOOL parseData(LLXmlTreeNode* node); /*virtual*/ void apply( ESex avatar_sex ) {} + // SUNSHINE CLEANUP no upload_bake /*virtual*/ void setWeight(F32 weight, BOOL upload_bake); + // SUNSHINE CLEANUP no upload_bake /*virtual*/ void setAnimationTarget(F32 target_value, BOOL upload_bake); + // SUNSHINE CLEANUP no upload_bake /*virtual*/ void animate(F32 delta, BOOL upload_bake); // LLViewerVisualParam Virtual functions @@ -190,6 +193,7 @@ public: // New functions LLColor4 getNetColor() const; protected: + // SUNSHINE CLEANUP no upload virtual void onGlobalColorChanged(bool upload_bake) {} private: LL_ALIGN_16(LLVector4a mAvgDistortionVec); -- cgit v1.2.3 From 82f147367fb5e4ee4bbe53db01856ea375058825 Mon Sep 17 00:00:00 2001 From: "Brad Payne (Vir Linden)" Date: Thu, 19 Sep 2013 11:10:59 -0400 Subject: SH-3455 WIP - removing bake upload code --- indra/llappearance/lltexlayerparams.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'indra/llappearance/lltexlayerparams.h') diff --git a/indra/llappearance/lltexlayerparams.h b/indra/llappearance/lltexlayerparams.h index c1ea8a9fb6..86d1ea9e67 100755 --- a/indra/llappearance/lltexlayerparams.h +++ b/indra/llappearance/lltexlayerparams.h @@ -84,11 +84,11 @@ public: ///*virtual*/ BOOL parseData(LLXmlTreeNode* node); /*virtual*/ void apply( ESex avatar_sex ) {} // SUNSHINE CLEANUP no upload_bake - /*virtual*/ void setWeight(F32 weight, BOOL upload_bake); + /*virtual*/ void setWeight(F32 weight); // SUNSHINE CLEANUP no upload_bake - /*virtual*/ void setAnimationTarget(F32 target_value, BOOL upload_bake); + /*virtual*/ void setAnimationTarget(F32 target_value); // SUNSHINE CLEANUP no upload_bake - /*virtual*/ void animate(F32 delta, BOOL upload_bake); + /*virtual*/ void animate(F32 delta); // LLViewerVisualParam Virtual functions /*virtual*/ F32 getTotalDistortion() { return 1.f; } @@ -177,9 +177,9 @@ public: // LLVisualParam Virtual functions ///*virtual*/ BOOL parseData(LLXmlTreeNode* node); /*virtual*/ void apply( ESex avatar_sex ) {} - /*virtual*/ void setWeight(F32 weight, BOOL upload_bake); - /*virtual*/ void setAnimationTarget(F32 target_value, BOOL upload_bake); - /*virtual*/ void animate(F32 delta, BOOL upload_bake); + /*virtual*/ void setWeight(F32 weight); + /*virtual*/ void setAnimationTarget(F32 target_value); + /*virtual*/ void animate(F32 delta); // LLViewerVisualParam Virtual functions @@ -194,7 +194,7 @@ public: LLColor4 getNetColor() const; protected: // SUNSHINE CLEANUP no upload - virtual void onGlobalColorChanged(bool upload_bake) {} + virtual void onGlobalColorChanged() {} private: LL_ALIGN_16(LLVector4a mAvgDistortionVec); } LL_ALIGN_POSTFIX(16); -- cgit v1.2.3 From d58e7cfbfcec163345e87c0c5e5f74d01075246b Mon Sep 17 00:00:00 2001 From: "Brad Payne (Vir Linden)" Date: Thu, 19 Sep 2013 13:59:20 -0400 Subject: SH-3455 WIP - removing bake upload code --- indra/llappearance/lltexlayerparams.h | 4 ---- 1 file changed, 4 deletions(-) (limited to 'indra/llappearance/lltexlayerparams.h') diff --git a/indra/llappearance/lltexlayerparams.h b/indra/llappearance/lltexlayerparams.h index 86d1ea9e67..e1a8c28265 100755 --- a/indra/llappearance/lltexlayerparams.h +++ b/indra/llappearance/lltexlayerparams.h @@ -83,11 +83,8 @@ public: // LLVisualParam Virtual functions ///*virtual*/ BOOL parseData(LLXmlTreeNode* node); /*virtual*/ void apply( ESex avatar_sex ) {} - // SUNSHINE CLEANUP no upload_bake /*virtual*/ void setWeight(F32 weight); - // SUNSHINE CLEANUP no upload_bake /*virtual*/ void setAnimationTarget(F32 target_value); - // SUNSHINE CLEANUP no upload_bake /*virtual*/ void animate(F32 delta); // LLViewerVisualParam Virtual functions @@ -193,7 +190,6 @@ public: // New functions LLColor4 getNetColor() const; protected: - // SUNSHINE CLEANUP no upload virtual void onGlobalColorChanged() {} private: LL_ALIGN_16(LLVector4a mAvgDistortionVec); -- cgit v1.2.3 From 0160c514c5e0bc3e575b33ef27924a9c8c7c30cf Mon Sep 17 00:00:00 2001 From: Stinson Linden Date: Fri, 23 May 2014 21:56:44 +0100 Subject: 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. --- indra/llappearance/lltexlayerparams.h | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'indra/llappearance/lltexlayerparams.h') 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 mCachedProcessedTexture; LLPointer mStaticImageTGA; LLPointer 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); -- cgit v1.2.3