diff options
| author | Don Kjer <don@lindenlab.com> | 2012-09-13 22:14:53 +0000 |
|---|---|---|
| committer | Don Kjer <don@lindenlab.com> | 2012-09-13 22:14:53 +0000 |
| commit | 5bb8962c4e2e1ca12d637fcddc02a78f5ecf7225 (patch) | |
| tree | ce95886fb4163fccef9df045bfe6b0088de4ffc8 /indra/newview/llviewerwearable.cpp | |
| parent | 8ba2b388769e245ec1b49b7d6d4b0372d684ff86 (diff) | |
| parent | b4866775a2acc98ebcb3986d7779eea479028ff9 (diff) | |
Merge sunshine -> sunshine-experimental
Diffstat (limited to 'indra/newview/llviewerwearable.cpp')
| -rw-r--r-- | indra/newview/llviewerwearable.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/indra/newview/llviewerwearable.cpp b/indra/newview/llviewerwearable.cpp index 8fe3aff0b0..e9fa92e8be 100644 --- a/indra/newview/llviewerwearable.cpp +++ b/indra/newview/llviewerwearable.cpp @@ -320,6 +320,15 @@ void LLViewerWearable::writeToAvatar(LLAvatarAppearance *avatarp) if (!avatarp || !viewer_avatar) return; + if (!viewer_avatar->isValid()) return; + +#if 1 + if (!viewer_avatar->isUsingLocalAppearance()) + { + return; + } +#endif + ESex old_sex = avatarp->getSex(); LLWearable::writeToAvatar(avatarp); |