diff options
| author | Graham Madarasz <graham@lindenlab.com> | 2019-08-12 21:33:19 +0000 |
|---|---|---|
| committer | Graham Madarasz <graham@lindenlab.com> | 2019-08-12 21:33:19 +0000 |
| commit | 8bbf3055dbdab8c3f40cc10b547804e948d76e1f (patch) | |
| tree | 328d3bcc144696a42b6b10054fed390b6824eb14 /indra/newview/llcontrolavatar.cpp | |
| parent | bfc4b9fcf4bb3266e06c2f954854a430cca5075f (diff) | |
| parent | 5937a4222473131d0cec4238fc234646e9aba91e (diff) | |
Merged in graham_linden/viewer-eep-g (pull request #476)
SL-10566, SL-11676, SL-11677
Diffstat (limited to 'indra/newview/llcontrolavatar.cpp')
| -rw-r--r-- | indra/newview/llcontrolavatar.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llcontrolavatar.cpp b/indra/newview/llcontrolavatar.cpp index 1e8ec4fe0f..6da7163f9f 100644 --- a/indra/newview/llcontrolavatar.cpp +++ b/indra/newview/llcontrolavatar.cpp @@ -255,7 +255,7 @@ void LLControlAvatar::recursiveScaleJoint(LLJoint* joint, F32 factor) { joint->setScale(factor * joint->getScale()); - for (LLJoint::child_list_t::iterator iter = joint->mChildren.begin(); + for (LLJoint::joints_t::iterator iter = joint->mChildren.begin(); iter != joint->mChildren.end(); ++iter) { LLJoint* child = *iter; |