diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2023-06-01 09:57:57 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2023-06-01 09:57:57 -0400 |
| commit | d844da2a6c5fc1a75e606150bb070fdb787698d3 (patch) | |
| tree | 349ecda36a5a561d6e564e2cc3db39121fd8946b /indra/llcharacter/llpose.cpp | |
| parent | 8a74efa38ba631be5400c4912a6339310968c9d7 (diff) | |
| parent | 7d05ade3f10563e8c202106e00cb3d273ab13338 (diff) | |
SL-18330: Merge branch 'xcode-14.3' into fix-monterey
to pick up new merge from main.
Diffstat (limited to 'indra/llcharacter/llpose.cpp')
| -rw-r--r-- | indra/llcharacter/llpose.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/indra/llcharacter/llpose.cpp b/indra/llcharacter/llpose.cpp index fc95fafd61..6f41a0e747 100644 --- a/indra/llcharacter/llpose.cpp +++ b/indra/llcharacter/llpose.cpp @@ -148,11 +148,9 @@ LLJointState* LLPose::findJointState(const std::string &name) void LLPose::setWeight(F32 weight) { joint_map_iterator iter; - for(iter = mJointMap.begin(); - iter != mJointMap.end(); - ++iter) + for (joint_map_value_type& joint_pair : mJointMap) { - iter->second->setWeight(weight); + joint_pair.second->setWeight(weight); } mWeight = weight; } |