summaryrefslogtreecommitdiff
path: root/indra/llappearance
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2012-10-03 17:13:18 -0400
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2012-10-03 17:13:18 -0400
commite29b66ed6ce29528f7b733c51db22a31a05d3a5f (patch)
treecc4485d5796d303a69b754a6b27c26f66eb768fc /indra/llappearance
parent5010cf72d345e60d0a367ea213dafe8727414612 (diff)
additional fixes for avoiding avatar param manipulation via wearables, setting correct state from avatar appearance
Diffstat (limited to 'indra/llappearance')
-rwxr-xr-x[-rw-r--r--]indra/llappearance/llwearabledata.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/llappearance/llwearabledata.cpp b/indra/llappearance/llwearabledata.cpp
index d70bbf286a..401b1dc192 100644..100755
--- a/indra/llappearance/llwearabledata.cpp
+++ b/indra/llappearance/llwearabledata.cpp
@@ -119,6 +119,11 @@ U32 LLWearableData::pushWearable(const LLWearableType::EType type,
void LLWearableData::wearableUpdated(LLWearable *wearable, BOOL removed)
{
wearable->setUpdated();
+ // FIXME DRANO avoid updating params via wearables when rendering server-baked appearance.
+ if (mAvatarAppearance->isUsingServerBakes() && !mAvatarAppearance->isUsingLocalAppearance())
+ {
+ return;
+ }
if (!removed)
{
pullCrossWearableValues(wearable->getType());