diff options
| author | Anchor <none@none> | 2018-11-28 15:16:01 -0800 |
|---|---|---|
| committer | Anchor <none@none> | 2018-11-28 15:16:01 -0800 |
| commit | 014480a79b765587881d0c0f707a7ee191f5fe2e (patch) | |
| tree | 4d759c7b996065cccb9171a51a1a3f05d04b6e31 /indra/newview/llappearancemgr.cpp | |
| parent | 076719013ec2dab7bf8fd1f4d1f953ab73d594e9 (diff) | |
| parent | 8558ce5c600b810356010ba3cd6d534ef22f4081 (diff) | |
Merge
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. |