livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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.
meow-7.2.2
Nyx Linden 2013-10-16 15:28:10 -04:00
parent 1f8b37e9ad
commit b42c70173c
5 changed files with 2 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
autobuild.xml
View File

@ -1290,9 +1290,9 @@
<key>archive</key>
<map>
<key>hash</key>
<string>fa7b79adc95946028580a609e33d885e</string>
<string>bda18a1f808eb248d69ff14fa2c69862</string>
<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>
<key>name</key>
<string>linux</string>

7
indra/llappearance/llavatarappearance.h
View File

@ -219,12 +219,6 @@ public:
** **
*******************************************************************************/
//--------------------------------------------------------------------
// Composites
//--------------------------------------------------------------------
public:
virtual void invalidateComposite(LLTexLayerSet* layerset) = 0;
/********************************************************************************
** **
** MESHES
@ -263,7 +257,6 @@ public:
//--------------------------------------------------------------------
public:
LLColor4 getGlobalColor(const std::string& color_name ) const;
virtual void onGlobalColorChanged(const LLTexGlobalColor* global_color) = 0;
protected:
LLTexGlobalColor* mTexSkinColor;
LLTexGlobalColor* mTexHairColor;

5
indra/llappearance/lltexglobalcolor.cpp
View File

@ -103,11 +103,6 @@ LLTexParamGlobalColor::LLTexParamGlobalColor(LLTexGlobalColor* tex_global_color)
return new_param;
}
void LLTexParamGlobalColor::onGlobalColorChanged()
{
mAvatarAppearance->onGlobalColorChanged(mTexGlobalColor);
}
//-----------------------------------------------------------------------------
// LLTexGlobalColorInfo
//-----------------------------------------------------------------------------

2
indra/llappearance/lltexglobalcolor.h
View File

@ -74,8 +74,6 @@ class LLTexParamGlobalColor : public LLTexLayerParamColor
public:
LLTexParamGlobalColor(LLTexGlobalColor *tex_color);
/*virtual*/ LLViewerVisualParam* cloneParam(LLWearable* wearable) const;
protected:
/*virtual*/ void onGlobalColorChanged();
private:
LLTexGlobalColor* mTexGlobalColor;
};

17
indra/llappearance/lltexlayerparams.cpp
View File

@ -178,7 +178,6 @@ void LLTexLayerParamAlpha::setWeight(F32 weight)
if ((mAvatarAppearance->getSex() & getSex()) &&
(mAvatarAppearance->isSelf() && !mIsDummy)) // only trigger a baked texture update if we're changing a wearable's visual param.
{
mAvatarAppearance->invalidateComposite(mTexLayer->getTexLayerSet());
mTexLayer->invalidateMorphMasks();
}
}
@ -466,22 +465,6 @@ void LLTexLayerParamColor::setWeight(F32 weight)
if (cur_u8 != new_u8)
{
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;
}
}