diff options
| author | Graham Linden <graham@lindenlab.com> | 2018-11-14 15:22:47 -0800 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2018-11-14 15:22:47 -0800 |
| commit | aa0115053aaa28de1c472410931c57b3e43b72a7 (patch) | |
| tree | 9a8ba45529cb125a2ae5cd4672b3fd093af9b45c /indra/newview/llappearancemgr.cpp | |
| parent | 4662ba8a2693780198d555a49a00cfafba838d41 (diff) | |
| parent | 1d022e86c84039f88c531e91ce857666acd224a1 (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 e4a5c58c7b..2bdffec7fb 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. |