diff options
| author | Don Kjer <don@lindenlab.com> | 2012-10-04 03:13:14 +0000 |
|---|---|---|
| committer | Don Kjer <don@lindenlab.com> | 2012-10-04 03:13:14 +0000 |
| commit | 6d613b61d76c1909021983901920b6b1dc2c80f4 (patch) | |
| tree | ade650a2b4b5aa37a549fc90c106f128f7095cc6 /indra/llappearance | |
| parent | c9ab9590aa1d44ea139b16e7ffcb1461d928bdd5 (diff) | |
| parent | 13d6a9920d06bd718b632c0980f8340909b8187c (diff) | |
Automated merge
Diffstat (limited to 'indra/llappearance')
| -rwxr-xr-x[-rw-r--r--] | indra/llappearance/llwearabledata.cpp | 5 |
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()); |