diff options
author | Nat Goodspeed <nat@lindenlab.com> | 2023-07-12 10:08:56 -0400 |
---|---|---|
committer | Nat Goodspeed <nat@lindenlab.com> | 2023-07-12 10:08:56 -0400 |
commit | 73d90aa9dd87986dc2ef8f39db346b71c58b181b (patch) | |
tree | a2ec930f732aaed7d7addbb22bb34b15c78d408b /indra/llcharacter/llanimationstates.cpp | |
parent | 8e70575be833cf2056b1ceef7ef842cbc7700ce0 (diff) | |
parent | e80f0f331dbfca686e0a80c557e9b1e455c8d167 (diff) |
SL-18837: Merge branch 'DRTVWR-587-maint-V' into rm-cxxstd.
Diffstat (limited to 'indra/llcharacter/llanimationstates.cpp')
-rw-r--r-- | indra/llcharacter/llanimationstates.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/indra/llcharacter/llanimationstates.cpp b/indra/llcharacter/llanimationstates.cpp index c16cae1bbc..2e78e30405 100644 --- a/indra/llcharacter/llanimationstates.cpp +++ b/indra/llcharacter/llanimationstates.cpp @@ -379,12 +379,11 @@ LLUUID LLAnimationLibrary::stringToAnimState( const std::string& name, BOOL allo if (true_name) { - for (anim_map_t::iterator iter = mAnimMap.begin(); - iter != mAnimMap.end(); iter++) + for (anim_map_t::value_type& anim_pair : mAnimMap) { - if (iter->second == true_name) + if (anim_pair.second == true_name) { - id = iter->first; + id = anim_pair.first; break; } } |