diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2023-04-11 00:15:27 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2023-04-11 00:15:27 +0300 |
| commit | db63f252a275beea884bba9177f8156321bde472 (patch) | |
| tree | 6ef30fcad846c5e8e50ffe137abbda3bd7f39971 /indra/llappearance/llavatarjointmesh.cpp | |
| parent | ba8bcf6520eb4cbcdf93393ecdeda4e6c0bc5846 (diff) | |
| parent | 53d4e69c514374622afb93f81067aaeec64a443b (diff) | |
Merge branch 'contribute' into DRTVWR-582-maint-U
# Conflicts:
# indra/llaudio/llaudioengine.cpp
Diffstat (limited to 'indra/llappearance/llavatarjointmesh.cpp')
| -rw-r--r-- | indra/llappearance/llavatarjointmesh.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/indra/llappearance/llavatarjointmesh.cpp b/indra/llappearance/llavatarjointmesh.cpp index 0a23b1fda3..ed39f78d28 100644 --- a/indra/llappearance/llavatarjointmesh.cpp +++ b/indra/llappearance/llavatarjointmesh.cpp @@ -379,10 +379,9 @@ void LLAvatarJointMesh::setupJoint(LLAvatarJoint* current_joint) } // depth-first traversal - for (LLJoint::joints_t::iterator iter = current_joint->mChildren.begin(); - iter != current_joint->mChildren.end(); ++iter) + for (LLJoint* joint : current_joint->mChildren) { - LLAvatarJoint* child_joint = (LLAvatarJoint*)(*iter); + LLAvatarJoint* child_joint = (LLAvatarJoint*)joint; setupJoint(child_joint); } } |