diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2017-08-04 16:20:04 +0100 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2017-08-04 16:20:04 +0100 |
| commit | 72010fba4d07c768b0f5edd5dc56bf89a98a9985 (patch) | |
| tree | 55b0be597c77c14dc24665d403fa6dd6f74d1f7d /indra/newview/llappearancemgr.cpp | |
| parent | a57170724344842e26b8cd0fa4a47c24efa834c5 (diff) | |
SL-718 - bug fixes for animated objects as attachments: Pause all associated avatars when selecting/editing. Don't apply joint positions to the attached avatar on login.
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 c928cf0601..d58d03d68d 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. |