summaryrefslogtreecommitdiff
path: root/indra/llcharacter/llcharacter.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/llcharacter/llcharacter.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/llcharacter/llcharacter.cpp')
-rw-r--r--indra/llcharacter/llcharacter.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llcharacter/llcharacter.cpp b/indra/llcharacter/llcharacter.cpp
index 4df975ecc5..b764ef0c7e 100644
--- a/indra/llcharacter/llcharacter.cpp
+++ b/indra/llcharacter/llcharacter.cpp
@@ -252,7 +252,7 @@ void LLCharacter::dumpCharacter( LLJoint* joint )
LL_INFOS() << "DEBUG: " << joint->getName() << " (" << (joint->getParent()?joint->getParent()->getName():std::string("ROOT")) << ")" << LL_ENDL;
// recurse
- 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_joint = *iter;