summaryrefslogtreecommitdiff
path: root/indra/llappearance
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2012-09-26 06:36:24 -0400
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2012-09-26 06:36:24 -0400
commitae0bb922909af95d96c140c1d74a4f39a264d4ec (patch)
treeaa75f1525641908cfa99777e11ff2ccf9228221e /indra/llappearance
parentf3d52b8d54c3be67262d4d8ae9a00253e9d55249 (diff)
renamed isUsingBakedTextures to more accurate isUsingServerBakes. Commented some areas we are probably using the function incorrectly
Diffstat (limited to 'indra/llappearance')
-rwxr-xr-x[-rw-r--r--]indra/llappearance/llavatarappearance.h4
-rw-r--r--indra/llappearance/lltexlayerparams.cpp2
2 files changed, 4 insertions, 2 deletions
diff --git a/indra/llappearance/llavatarappearance.h b/indra/llappearance/llavatarappearance.h
index 5726ff62d1..2aa43d25d2 100644..100755
--- a/indra/llappearance/llavatarappearance.h
+++ b/indra/llappearance/llavatarappearance.h
@@ -106,7 +106,9 @@ public:
public:
virtual bool isSelf() const { return false; } // True if this avatar is for this viewer's agent
virtual BOOL isValid() const;
- virtual BOOL isUsingBakedTextures() const = 0;
+ virtual BOOL isUsingServerBakes() const = 0;
+ virtual BOOL isUsingLocalAppearance() const = 0;
+ virtual BOOL isEditingAppearance() const = 0;
bool isBuilt() const { return mIsBuilt; }
diff --git a/indra/llappearance/lltexlayerparams.cpp b/indra/llappearance/lltexlayerparams.cpp
index 82c92b5a5e..651468b1a5 100644
--- a/indra/llappearance/lltexlayerparams.cpp
+++ b/indra/llappearance/lltexlayerparams.cpp
@@ -176,7 +176,7 @@ void LLTexLayerParamAlpha::setWeight(F32 weight, BOOL upload_bake)
if ((mAvatarAppearance->getSex() & getSex()) && (mAvatarAppearance->isSelf() && !mIsDummy)) // only trigger a baked texture update if we're changing a wearable's visual param.
{
- if (!mAvatarAppearance->isUsingBakedTextures())
+ if (!mAvatarAppearance->isUsingServerBakes())
{
upload_bake = FALSE;
}