summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2016-08-12 14:20:44 -0400
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2016-08-12 14:20:44 -0400
commit85a13b53f5570c44c476a7af70846874dfc3ecbf (patch)
tree69c5230d129510c7d5abcf54b718f9969c0a2831 /indra/newview
parent95d9e85f9539c449f37c438b90a90e6ac73d3b87 (diff)
MAINT-6631 - reluctantly, added support for animation of collision volumes, to avoid breaking existing content.
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llvoavatar.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index b1282fb4de..6e436e85e9 100644
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -5921,7 +5921,7 @@ void LLVOAvatar::initAttachmentPoints(bool ignore_hud_joints)
attachment->setVisibleInFirstPerson(info->mVisibleFirstPerson);
attachment->setIsHUDAttachment(info->mIsHUDAttachment);
// attachment can potentially be animated, needs a number.
- attachment->setJointNum(mSkeleton.size() + attachmentID - 1);
+ attachment->setJointNum(mNextJointNum++);
if (newly_created)
{