diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2012-09-28 10:14:07 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2012-09-28 10:14:07 -0400 |
| commit | 5c101330caf7eb4ee145c8b2f2921ff6b3a870ee (patch) | |
| tree | 884939b79c8147c5b950f68b38bdcedf9a5a58e0 /indra/newview/llviewerwearable.cpp | |
| parent | f9a5cdba507096d16d834fe58c850b9f55ad9462 (diff) | |
| parent | ec3f8f4a67bb1a47e634d05ba29ddc6c7bed38b8 (diff) | |
merge
Diffstat (limited to 'indra/newview/llviewerwearable.cpp')
| -rwxr-xr-x | indra/newview/llviewerwearable.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/llviewerwearable.cpp b/indra/newview/llviewerwearable.cpp index f6a03e708e..f3d9b2c678 100755 --- a/indra/newview/llviewerwearable.cpp +++ b/indra/newview/llviewerwearable.cpp @@ -320,8 +320,9 @@ void LLViewerWearable::writeToAvatar(LLAvatarAppearance *avatarp) if (!viewer_avatar->isValid()) return; - if (viewer_avatar->getRegion() && - (viewer_avatar->getRegion()->getCentralBakeVersion()>0) && + // FIXME DRANO - kludgy way to avoid overwriting avatar state from wearables. + // Ideally would avoid calling this func in the first place. + if (viewer_avatar->isUsingServerBakes() && !viewer_avatar->isUsingLocalAppearance()) { return; |