Skip to content
Snippets Groups Projects
Commit b42c7017 authored by Nyx Linden's avatar Nyx Linden
Browse files

SH-3455 BUILDFIX Updating linux appearance utility to use the new refactor

Eliminated some unnecessary functions that the refactor took care of,
linux build should be fixed.
parent 1f8b37e9
No related branches found
No related tags found
No related merge requests found
...@@ -1290,9 +1290,9 @@ ...@@ -1290,9 +1290,9 @@
<key>archive</key> <key>archive</key>
<map> <map>
<key>hash</key> <key>hash</key>
<string>fa7b79adc95946028580a609e33d885e</string> <string>bda18a1f808eb248d69ff14fa2c69862</string>
<key>url</key> <key>url</key>
<string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/llappearanceutility-source/rev/279662/arch/Linux/installer/llappearanceutility_source-0.1-linux-20130808.tar.bz2</string> <string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/llappearanceutility-source/rev/282464/arch/Linux/installer/llappearanceutility_source-0.1-linux-20131016.tar.bz2</string>
</map> </map>
<key>name</key> <key>name</key>
<string>linux</string> <string>linux</string>
......
...@@ -219,12 +219,6 @@ class LLAvatarAppearance : public LLCharacter ...@@ -219,12 +219,6 @@ class LLAvatarAppearance : public LLCharacter
** ** ** **
*******************************************************************************/ *******************************************************************************/
//--------------------------------------------------------------------
// Composites
//--------------------------------------------------------------------
public:
virtual void invalidateComposite(LLTexLayerSet* layerset) = 0;
/******************************************************************************** /********************************************************************************
** ** ** **
** MESHES ** MESHES
...@@ -263,7 +257,6 @@ class LLAvatarAppearance : public LLCharacter ...@@ -263,7 +257,6 @@ class LLAvatarAppearance : public LLCharacter
//-------------------------------------------------------------------- //--------------------------------------------------------------------
public: public:
LLColor4 getGlobalColor(const std::string& color_name ) const; LLColor4 getGlobalColor(const std::string& color_name ) const;
virtual void onGlobalColorChanged(const LLTexGlobalColor* global_color) = 0;
protected: protected:
LLTexGlobalColor* mTexSkinColor; LLTexGlobalColor* mTexSkinColor;
LLTexGlobalColor* mTexHairColor; LLTexGlobalColor* mTexHairColor;
......
...@@ -103,11 +103,6 @@ LLTexParamGlobalColor::LLTexParamGlobalColor(LLTexGlobalColor* tex_global_color) ...@@ -103,11 +103,6 @@ LLTexParamGlobalColor::LLTexParamGlobalColor(LLTexGlobalColor* tex_global_color)
return new_param; return new_param;
} }
void LLTexParamGlobalColor::onGlobalColorChanged()
{
mAvatarAppearance->onGlobalColorChanged(mTexGlobalColor);
}
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// LLTexGlobalColorInfo // LLTexGlobalColorInfo
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
......
...@@ -74,8 +74,6 @@ class LLTexParamGlobalColor : public LLTexLayerParamColor ...@@ -74,8 +74,6 @@ class LLTexParamGlobalColor : public LLTexLayerParamColor
public: public:
LLTexParamGlobalColor(LLTexGlobalColor *tex_color); LLTexParamGlobalColor(LLTexGlobalColor *tex_color);
/*virtual*/ LLViewerVisualParam* cloneParam(LLWearable* wearable) const; /*virtual*/ LLViewerVisualParam* cloneParam(LLWearable* wearable) const;
protected:
/*virtual*/ void onGlobalColorChanged();
private: private:
LLTexGlobalColor* mTexGlobalColor; LLTexGlobalColor* mTexGlobalColor;
}; };
......
...@@ -178,7 +178,6 @@ void LLTexLayerParamAlpha::setWeight(F32 weight) ...@@ -178,7 +178,6 @@ void LLTexLayerParamAlpha::setWeight(F32 weight)
if ((mAvatarAppearance->getSex() & getSex()) && if ((mAvatarAppearance->getSex() & getSex()) &&
(mAvatarAppearance->isSelf() && !mIsDummy)) // only trigger a baked texture update if we're changing a wearable's visual param. (mAvatarAppearance->isSelf() && !mIsDummy)) // only trigger a baked texture update if we're changing a wearable's visual param.
{ {
mAvatarAppearance->invalidateComposite(mTexLayer->getTexLayerSet());
mTexLayer->invalidateMorphMasks(); mTexLayer->invalidateMorphMasks();
} }
} }
...@@ -466,22 +465,6 @@ void LLTexLayerParamColor::setWeight(F32 weight) ...@@ -466,22 +465,6 @@ void LLTexLayerParamColor::setWeight(F32 weight)
if (cur_u8 != new_u8) if (cur_u8 != new_u8)
{ {
mCurWeight = new_weight; mCurWeight = new_weight;
if (info->mNumColors <= 0)
{
// This will happen when we set the default weight the first time.
return;
}
if ((mAvatarAppearance->getSex() & getSex()) && (mAvatarAppearance->isSelf() && !mIsDummy)) // only trigger a baked texture update if we're changing a wearable's visual param.
{
onGlobalColorChanged();
if (mTexLayer)
{
mAvatarAppearance->invalidateComposite(mTexLayer->getTexLayerSet());
}
}
// llinfos << "param " << mName << " = " << new_weight << llendl; // llinfos << "param " << mName << " = " << new_weight << llendl;
} }
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment