summaryrefslogtreecommitdiff
path: root/indra/llappearance/llpolyskeletaldistortion.cpp
diff options
context:
space:
mode:
authorGraham Madarasz <graham@lindenlab.com>2019-08-12 21:33:19 +0000
committerGraham Madarasz <graham@lindenlab.com>2019-08-12 21:33:19 +0000
commit8bbf3055dbdab8c3f40cc10b547804e948d76e1f (patch)
tree328d3bcc144696a42b6b10054fed390b6824eb14 /indra/llappearance/llpolyskeletaldistortion.cpp
parentbfc4b9fcf4bb3266e06c2f954854a430cca5075f (diff)
parent5937a4222473131d0cec4238fc234646e9aba91e (diff)
Merged in graham_linden/viewer-eep-g (pull request #476)
SL-10566, SL-11676, SL-11677
Diffstat (limited to 'indra/llappearance/llpolyskeletaldistortion.cpp')
-rw-r--r--indra/llappearance/llpolyskeletaldistortion.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llappearance/llpolyskeletaldistortion.cpp b/indra/llappearance/llpolyskeletaldistortion.cpp
index 5b77a7433a..ae38c25dbf 100644
--- a/indra/llappearance/llpolyskeletaldistortion.cpp
+++ b/indra/llappearance/llpolyskeletaldistortion.cpp
@@ -160,7 +160,7 @@ BOOL LLPolySkeletalDistortion::setInfo(LLPolySkeletalDistortionInfo *info)
mJointScales[joint] = bone_info->mScaleDeformation;
// apply to children that need to inherit it
- for (LLJoint::child_list_t::iterator iter = joint->mChildren.begin();
+ for (LLJoint::joints_t::iterator iter = joint->mChildren.begin();
iter != joint->mChildren.end(); ++iter)
{
LLAvatarJoint* child_joint = (LLAvatarJoint*)(*iter);