diff options
author | Graham Linden <graham@lindenlab.com> | 2019-08-26 13:23:25 -0700 |
---|---|---|
committer | Graham Linden <graham@lindenlab.com> | 2019-08-26 13:23:25 -0700 |
commit | 8f02fc8a66c51df6d71d1d04020f283c0fcb1a24 (patch) | |
tree | 2b403ee4e49567860852f48fd4b74050e3a70612 /indra/llappearance/llavatarappearance.cpp | |
parent | 723f1891db513acf36e0d20bdd93a615c31a5337 (diff) |
Fix llavatarappearance merge to not use iterator in favor of C++11 lingo.
Diffstat (limited to 'indra/llappearance/llavatarappearance.cpp')
-rw-r--r-- | indra/llappearance/llavatarappearance.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/indra/llappearance/llavatarappearance.cpp b/indra/llappearance/llavatarappearance.cpp index 6882d2a553..f7fbb6fda1 100644 --- a/indra/llappearance/llavatarappearance.cpp +++ b/indra/llappearance/llavatarappearance.cpp @@ -1743,10 +1743,9 @@ void LLAvatarAppearance::makeJointAliases(LLAvatarBoneInfo *bone_info) mJointAliasMap[*i] = bone_name; } - LLAvatarBoneInfo::child_list_t::const_iterator iter; - for (iter = bone_info->mChildList.begin(); iter != bone_info->mChildList.end(); ++iter) + for (LLAvatarBoneInfo* bone : bone_info->mChildren) { - makeJointAliases( *iter ); + makeJointAliases(bone); } } |