diff options
| author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2018-11-14 16:20:05 +0200 |
|---|---|---|
| committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2018-11-14 16:20:05 +0200 |
| commit | 39652180aea043b4e8d0cb1f9a2a484e5ce2a471 (patch) | |
| tree | 9a2c286caf4e05eb30870e462e04cdf0c4b46f9b /indra/newview/llappearancemgr.cpp | |
| parent | ccd20624e37d74217b5d633fb74ebc81672c53f5 (diff) | |
| parent | 34770cbf2ef34b7901552057a0823e502d42be1d (diff) | |
Merged in lindenlab/axon
Diffstat (limited to 'indra/newview/llappearancemgr.cpp')
| -rw-r--r-- | indra/newview/llappearancemgr.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp index c0f88ef704..08daeb0f59 100644 --- a/indra/newview/llappearancemgr.cpp +++ b/indra/newview/llappearancemgr.cpp @@ -880,7 +880,10 @@ void LLWearableHoldingPattern::onAllComplete() ++it) { LLViewerObject *objectp = *it; - gAgentAvatarp->addAttachmentOverridesForObject(objectp); + if (!objectp->isAnimatedObject()) + { + gAgentAvatarp->addAttachmentOverridesForObject(objectp); + } } // Add new attachments to match those requested. |