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/newview/llvoavatarself.cpp | |
| parent | c9ab9590aa1d44ea139b16e7ffcb1461d928bdd5 (diff) | |
| parent | 13d6a9920d06bd718b632c0980f8340909b8187c (diff) | |
Automated merge
Diffstat (limited to 'indra/newview/llvoavatarself.cpp')
| -rwxr-xr-x | indra/newview/llvoavatarself.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/indra/newview/llvoavatarself.cpp b/indra/newview/llvoavatarself.cpp index 7ca40a8752..a29ef2f3ad 100755 --- a/indra/newview/llvoavatarself.cpp +++ b/indra/newview/llvoavatarself.cpp @@ -668,6 +668,13 @@ BOOL LLVOAvatarSelf::setParamWeight(const LLViewerVisualParam *param, F32 weight return FALSE; } + // FIXME DRANO - kludgy way to avoid overwriting avatar state from wearables. + if (isUsingServerBakes() && !isUsingLocalAppearance()) + { + return FALSE; + } + + if (param->getCrossWearable()) { LLWearableType::EType type = (LLWearableType::EType)param->getWearableType(); |