summaryrefslogtreecommitdiff
path: root/indra/newview/llappearancemgr.cpp
diff options
context:
space:
mode:
authorRuslan Teliuk <ruslantproductengine@lindenlab.com>2018-11-27 17:45:45 +0200
committerRuslan Teliuk <ruslantproductengine@lindenlab.com>2018-11-27 17:45:45 +0200
commit4ab4c4498a04576a3cddf3533359a15a636b53b6 (patch)
tree064d6b7b40927a4b87803d6daf7f8db1a846ede6 /indra/newview/llappearancemgr.cpp
parentacc86a9139872e182fbeb5b9fc7daa12c5d2c029 (diff)
parentc21396181b090b626d7a9f989bcead2e517bb75f (diff)
Merged lindenlab/viewer-cougar into default
Diffstat (limited to 'indra/newview/llappearancemgr.cpp')
-rw-r--r--indra/newview/llappearancemgr.cpp5
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.