From e29b66ed6ce29528f7b733c51db22a31a05d3a5f Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Wed, 3 Oct 2012 17:13:18 -0400
Subject: additional fixes for avoiding avatar param manipulation via
wearables, setting correct state from avatar appearance
---
indra/llappearance/llwearabledata.cpp | 5 +++++
1 file changed, 5 insertions(+)
mode change 100644 => 100755 indra/llappearance/llwearabledata.cpp
(limited to 'indra/llappearance')
diff --git a/indra/llappearance/llwearabledata.cpp b/indra/llappearance/llwearabledata.cpp
old mode 100644
new mode 100755
index d70bbf286a..401b1dc192
--- 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());
--
cgit v1.2.3