summaryrefslogtreecommitdiff
path: root/indra/newview/llappearancemgr.cpp
diff options
context:
space:
mode:
authorAndreyL ProductEngine <alihatskiy@productengine.com>2018-11-14 23:03:31 +0200
committerAndreyL ProductEngine <alihatskiy@productengine.com>2018-11-14 23:03:31 +0200
commit8cac4f7b135a126c096b4eb96e618aeccad1b030 (patch)
tree636957925b67cad4bb3c7e7f7af382492b3e0452 /indra/newview/llappearancemgr.cpp
parent31be136d4056e02cbf5c377f3544235debb7376b (diff)
parent9839a68c5a0ceba42cbe2745b4c7ef279e32813f (diff)
Merged in lindenlab/viewer-lynx
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.