diff options
| author | Don Kjer <don@lindenlab.com> | 2012-10-17 23:12:52 +0000 |
|---|---|---|
| committer | Don Kjer <don@lindenlab.com> | 2012-10-17 23:12:52 +0000 |
| commit | a32dbd314809e7d0093745f0bbcb3628320f8c5e (patch) | |
| tree | f08973b9250835a7ef6fa61a90dfb43a2a30e183 /indra/llappearance/llwearabledata.cpp | |
| parent | 98e2488f6fd64eb428fcc8f659cb7f0d82196449 (diff) | |
| parent | 2390e21a9d2fc6f5cabe132a2bbd807aec186cfa (diff) | |
automated merge
Diffstat (limited to 'indra/llappearance/llwearabledata.cpp')
| -rwxr-xr-x | indra/llappearance/llwearabledata.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/llappearance/llwearabledata.cpp b/indra/llappearance/llwearabledata.cpp index 401b1dc192..68fdcca782 100755 --- a/indra/llappearance/llwearabledata.cpp +++ b/indra/llappearance/llwearabledata.cpp @@ -120,10 +120,12 @@ void LLWearableData::wearableUpdated(LLWearable *wearable, BOOL removed) { wearable->setUpdated(); // FIXME DRANO avoid updating params via wearables when rendering server-baked appearance. +#if 0 if (mAvatarAppearance->isUsingServerBakes() && !mAvatarAppearance->isUsingLocalAppearance()) { return; } +#endif if (!removed) { pullCrossWearableValues(wearable->getType()); |