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/llavatarappearance.cpp | 1 - indra/llappearance/llavatarappearance.h | 4 ---- indra/llappearance/lltexglobalcolor.cpp | 1 - indra/llappearance/lltexglobalcolor.h | 1 - indra/llappearance/lltexlayerparams.cpp | 4 ---- indra/llappearance/lltexlayerparams.h | 4 ---- 6 files changed, 15 deletions(-) (limited to 'indra/llappearance') diff --git a/indra/llappearance/llavatarappearance.cpp b/indra/llappearance/llavatarappearance.cpp index 05cd7e8c41..f10ae813fd 100755 --- a/indra/llappearance/llavatarappearance.cpp +++ b/indra/llappearance/llavatarappearance.cpp @@ -491,7 +491,6 @@ void LLAvatarAppearance::computeBodySize() if (new_body_size != mBodySize || old_offset != mAvatarOffset.mV[VZ]) { mBodySize = new_body_size; - bodySizeChanged(); } } diff --git a/indra/llappearance/llavatarappearance.h b/indra/llappearance/llavatarappearance.h index d7bfe0d7c7..3d99bb0cc7 100755 --- a/indra/llappearance/llavatarappearance.h +++ b/indra/llappearance/llavatarappearance.h @@ -144,7 +144,6 @@ protected: static BOOL parseSkeletonFile(const std::string& filename); virtual void buildCharacter(); virtual BOOL loadAvatar(); - virtual void bodySizeChanged() = 0; BOOL setupBone(const LLAvatarBoneInfo* info, LLJoint* parent, S32 ¤t_volume_num, S32 ¤t_joint_num); BOOL allocateCharacterJoints(U32 num); @@ -225,7 +224,6 @@ public: // Composites //-------------------------------------------------------------------- public: - // SUNSHINE CLEANUP no upload virtual void invalidateComposite(LLTexLayerSet* layerset) = 0; /******************************************************************************** @@ -257,7 +255,6 @@ protected: // Clothing colors (convenience functions to access visual parameters) //-------------------------------------------------------------------- public: - // SUNSHINE CLEANUP no upload void setClothesColor(LLAvatarAppearanceDefines::ETextureIndex te, const LLColor4& new_color); LLColor4 getClothesColor(LLAvatarAppearanceDefines::ETextureIndex te); static BOOL teToColorParams(LLAvatarAppearanceDefines::ETextureIndex te, U32 *param_name); @@ -267,7 +264,6 @@ public: //-------------------------------------------------------------------- public: LLColor4 getGlobalColor(const std::string& color_name ) const; - // SUNSHINE CLEANUP no upload virtual void onGlobalColorChanged(const LLTexGlobalColor* global_color) = 0; protected: LLTexGlobalColor* mTexSkinColor; diff --git a/indra/llappearance/lltexglobalcolor.cpp b/indra/llappearance/lltexglobalcolor.cpp index b9539e45b8..432e2e9f49 100755 --- a/indra/llappearance/lltexglobalcolor.cpp +++ b/indra/llappearance/lltexglobalcolor.cpp @@ -103,7 +103,6 @@ LLTexParamGlobalColor::LLTexParamGlobalColor(LLTexGlobalColor* tex_global_color) return new_param; } - // SUNSHINE CLEANUP no upload void LLTexParamGlobalColor::onGlobalColorChanged() { mAvatarAppearance->onGlobalColorChanged(mTexGlobalColor); diff --git a/indra/llappearance/lltexglobalcolor.h b/indra/llappearance/lltexglobalcolor.h index 3a6f852baf..1b0c91b5ca 100755 --- a/indra/llappearance/lltexglobalcolor.h +++ b/indra/llappearance/lltexglobalcolor.h @@ -75,7 +75,6 @@ public: LLTexParamGlobalColor(LLTexGlobalColor *tex_color); /*virtual*/ LLViewerVisualParam* cloneParam(LLWearable* wearable) const; protected: - // SUNSHINE CLEANUP no upload /*virtual*/ void onGlobalColorChanged(); private: LLTexGlobalColor* mTexGlobalColor; diff --git a/indra/llappearance/lltexlayerparams.cpp b/indra/llappearance/lltexlayerparams.cpp index 6d4001958e..80aded450d 100755 --- a/indra/llappearance/lltexlayerparams.cpp +++ b/indra/llappearance/lltexlayerparams.cpp @@ -160,7 +160,6 @@ BOOL LLTexLayerParamAlpha::getMultiplyBlend() const return ((LLTexLayerParamAlphaInfo *)getInfo())->mMultiplyBlend; } -// SUNSHINE CLEANUP no upload_bake void LLTexLayerParamAlpha::setWeight(F32 weight) { if (mIsAnimating || mTexLayer == NULL) @@ -185,7 +184,6 @@ void LLTexLayerParamAlpha::setWeight(F32 weight) } } -// SUNSHINE CLEANUP no upload_bake void LLTexLayerParamAlpha::setAnimationTarget(F32 target_value) { // do not animate dummy parameters @@ -204,7 +202,6 @@ void LLTexLayerParamAlpha::setAnimationTarget(F32 target_value) } } -// SUNSHINE CLEANUP no upload_bake void LLTexLayerParamAlpha::animate(F32 delta) { if (mNext) @@ -453,7 +450,6 @@ LLColor4 LLTexLayerParamColor::getNetColor() const } -// SUNSHINE CLEANUP no upload_bake void LLTexLayerParamColor::setWeight(F32 weight) { if (mIsAnimating) 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