summaryrefslogtreecommitdiff
path: root/indra/llappearance
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2013-09-18 17:03:34 -0400
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2013-09-18 17:03:34 -0400
commit36bb33b12ab090e2acbc7e00039cdff682882fa4 (patch)
treef09b7258220148b682c39019f189b2060ef3d8bd /indra/llappearance
parentc2ddc68afe0d9f122ee846ec1de1b4394f04998f (diff)
sunshine cleanup annotations
Diffstat (limited to 'indra/llappearance')
-rwxr-xr-x[-rw-r--r--]indra/llappearance/llavatarappearance.h3
-rw-r--r--indra/llappearance/lltexglobalcolor.cpp1
-rw-r--r--indra/llappearance/lltexglobalcolor.h1
-rwxr-xr-x[-rw-r--r--]indra/llappearance/lltexlayerparams.cpp5
-rwxr-xr-x[-rw-r--r--]indra/llappearance/lltexlayerparams.h4
5 files changed, 14 insertions, 0 deletions
diff --git a/indra/llappearance/llavatarappearance.h b/indra/llappearance/llavatarappearance.h
index bf13680496..3cb28c1137 100644..100755
--- a/indra/llappearance/llavatarappearance.h
+++ b/indra/llappearance/llavatarappearance.h
@@ -225,6 +225,7 @@ public:
// Composites
//--------------------------------------------------------------------
public:
+ // SUNSHINE CLEANUP no upload
virtual void invalidateComposite(LLTexLayerSet* layerset, BOOL upload_result) = 0;
/********************************************************************************
@@ -256,6 +257,7 @@ protected:
// Clothing colors (convenience functions to access visual parameters)
//--------------------------------------------------------------------
public:
+ // SUNSHINE CLEANUP no upload
void setClothesColor(LLAvatarAppearanceDefines::ETextureIndex te, const LLColor4& new_color, BOOL upload_bake);
LLColor4 getClothesColor(LLAvatarAppearanceDefines::ETextureIndex te);
static BOOL teToColorParams(LLAvatarAppearanceDefines::ETextureIndex te, U32 *param_name);
@@ -265,6 +267,7 @@ public:
//--------------------------------------------------------------------
public:
LLColor4 getGlobalColor(const std::string& color_name ) const;
+ // SUNSHINE CLEANUP no upload
virtual void onGlobalColorChanged(const LLTexGlobalColor* global_color, BOOL upload_bake) = 0;
protected:
LLTexGlobalColor* mTexSkinColor;
diff --git a/indra/llappearance/lltexglobalcolor.cpp b/indra/llappearance/lltexglobalcolor.cpp
index f38b982104..958f5f3069 100644
--- a/indra/llappearance/lltexglobalcolor.cpp
+++ b/indra/llappearance/lltexglobalcolor.cpp
@@ -103,6 +103,7 @@ LLTexParamGlobalColor::LLTexParamGlobalColor(LLTexGlobalColor* tex_global_color)
return new_param;
}
+ // SUNSHINE CLEANUP no upload
void LLTexParamGlobalColor::onGlobalColorChanged(bool upload_bake)
{
mAvatarAppearance->onGlobalColorChanged(mTexGlobalColor, upload_bake);
diff --git a/indra/llappearance/lltexglobalcolor.h b/indra/llappearance/lltexglobalcolor.h
index 2867479876..b9d12c801e 100644
--- a/indra/llappearance/lltexglobalcolor.h
+++ b/indra/llappearance/lltexglobalcolor.h
@@ -75,6 +75,7 @@ public:
LLTexParamGlobalColor(LLTexGlobalColor *tex_color);
/*virtual*/ LLViewerVisualParam* cloneParam(LLWearable* wearable) const;
protected:
+ // SUNSHINE CLEANUP no upload
/*virtual*/ void onGlobalColorChanged(bool upload_bake);
private:
LLTexGlobalColor* mTexGlobalColor;
diff --git a/indra/llappearance/lltexlayerparams.cpp b/indra/llappearance/lltexlayerparams.cpp
index 6aae9a8cc1..cd48dcece4 100644..100755
--- a/indra/llappearance/lltexlayerparams.cpp
+++ b/indra/llappearance/lltexlayerparams.cpp
@@ -160,6 +160,7 @@ BOOL LLTexLayerParamAlpha::getMultiplyBlend() const
return ((LLTexLayerParamAlphaInfo *)getInfo())->mMultiplyBlend;
}
+// SUNSHINE CLEANUP no upload_bake
void LLTexLayerParamAlpha::setWeight(F32 weight, BOOL upload_bake)
{
if (mIsAnimating || mTexLayer == NULL)
@@ -184,6 +185,7 @@ void LLTexLayerParamAlpha::setWeight(F32 weight, BOOL upload_bake)
}
}
+// SUNSHINE CLEANUP no upload_bake
void LLTexLayerParamAlpha::setAnimationTarget(F32 target_value, BOOL upload_bake)
{
// do not animate dummy parameters
@@ -202,6 +204,7 @@ void LLTexLayerParamAlpha::setAnimationTarget(F32 target_value, BOOL upload_bake
}
}
+// SUNSHINE CLEANUP no upload_bake
void LLTexLayerParamAlpha::animate(F32 delta, BOOL upload_bake)
{
if (mNext)
@@ -449,6 +452,8 @@ LLColor4 LLTexLayerParamColor::getNetColor() const
}
}
+
+// SUNSHINE CLEANUP no upload_bake
void LLTexLayerParamColor::setWeight(F32 weight, BOOL upload_bake)
{
if (mIsAnimating)
diff --git a/indra/llappearance/lltexlayerparams.h b/indra/llappearance/lltexlayerparams.h
index b38d28d3eb..c1ea8a9fb6 100644..100755
--- 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);