summaryrefslogtreecommitdiff
path: root/indra/newview/llcontrolavatar.cpp
diff options
context:
space:
mode:
authorGraham Linden <graham@lindenlab.com>2019-08-14 09:15:17 -0700
committerGraham Linden <graham@lindenlab.com>2019-08-14 09:15:17 -0700
commit886fe3eefc8688df206e7b397a6b9438c7492f5f (patch)
tree1851859f1fb2498bcd89a080d53620e77b9dc68f /indra/newview/llcontrolavatar.cpp
parent7a64e8f8bfeff17d6a5385a6c39f1056214cb59f (diff)
parent2207dc0e610c1bf18f04620bc216e0da71762237 (diff)
Merge
Diffstat (limited to 'indra/newview/llcontrolavatar.cpp')
-rw-r--r--indra/newview/llcontrolavatar.cpp2
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;