summaryrefslogtreecommitdiff
path: root/indra/llappearance/llavatarjointmesh.cpp
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2023-02-15 15:11:35 -0500
committerNat Goodspeed <nat@lindenlab.com>2023-02-15 15:11:35 -0500
commitaec39a0f9f7f16a7970e96bad552ca684af57e3f (patch)
tree742bfd7fee6d2cf98a9a93b5fc3d17ff2ca6557c /indra/llappearance/llavatarjointmesh.cpp
parent6ef3df54b3ff0dcfed3000819209a7633e53a32b (diff)
parent23a3da37a91ea80311b5820c48a12d56b989f69d (diff)
SL-18330: Merge branch 'contribute' into sl-18330-merge
Diffstat (limited to 'indra/llappearance/llavatarjointmesh.cpp')
-rw-r--r--indra/llappearance/llavatarjointmesh.cpp5
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);
}
}