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/llcharacter/llpose.cpp | |
| parent | ba8bcf6520eb4cbcdf93393ecdeda4e6c0bc5846 (diff) | |
| parent | 53d4e69c514374622afb93f81067aaeec64a443b (diff) | |
Merge branch 'contribute' into DRTVWR-582-maint-U
# Conflicts:
# indra/llaudio/llaudioengine.cpp
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; } |