diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2023-05-17 17:47:45 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2023-05-17 17:47:45 +0300 |
| commit | 4dcab10bf8a652c6513bf6c9eec3184f79d4d219 (patch) | |
| tree | 3cb870beefc8c0488532e0b424450780357ed7f5 /indra/llcharacter/llcharacter.cpp | |
| parent | 42f16180a985fc0e4704a4e25489ada9d662631a (diff) | |
| parent | 5a70639b7992842a9f74ec81b11bac56608b8f2e (diff) | |
Merge branch 'main' into DRTVWR-580-maint-T
# Conflicts:
# doc/contributions.txt
# indra/llcharacter/llkeyframemotion.cpp
# indra/newview/llfilepicker.cpp
Diffstat (limited to 'indra/llcharacter/llcharacter.cpp')
| -rw-r--r-- | indra/llcharacter/llcharacter.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/indra/llcharacter/llcharacter.cpp b/indra/llcharacter/llcharacter.cpp index 376f096642..cf6be8daf0 100644 --- a/indra/llcharacter/llcharacter.cpp +++ b/indra/llcharacter/llcharacter.cpp @@ -246,10 +246,8 @@ void LLCharacter::dumpCharacter( LLJoint* joint ) LL_INFOS() << "DEBUG: " << joint->getName() << " (" << (joint->getParent()?joint->getParent()->getName():std::string("ROOT")) << ")" << LL_ENDL; // recurse - for (LLJoint::joints_t::iterator iter = joint->mChildren.begin(); - iter != joint->mChildren.end(); ++iter) + for (LLJoint* child_joint : joint->mChildren) { - LLJoint* child_joint = *iter; dumpCharacter(child_joint); } } |