diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-02-05 21:53:31 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-02-05 21:53:31 +0200 |
| commit | aa52c852d600aa6b2ea17cdd86f53972c95cca4a (patch) | |
| tree | 757f3a3446e8f55e1cc073f1b3ab54d8e5af1b65 /indra/newview/llviewermessage.cpp | |
| parent | edb2fb57f8782f966c7ea675d2e4c0135352ef02 (diff) | |
| parent | 2a849259223a2d3fabafc118d711e73fa7fd604f (diff) | |
Merge pull request #734 from secondlife/DRTVWR-594-maint-Y
Diffstat (limited to 'indra/newview/llviewermessage.cpp')
| -rw-r--r-- | indra/newview/llviewermessage.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index ada898b98c..55e43352bc 100644 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -4158,6 +4158,12 @@ void process_avatar_animation(LLMessageSystem *mesgsys, void **user_data) LLVOAvatar::AnimSourceIterator anim_it = avatarp->mAnimationSources.find(object_id); for (;anim_it != avatarp->mAnimationSources.end(); ++anim_it) { + if (anim_it->first != object_id) + { + // elements with the same key are always contiguous, bail if we went past the + // end of this object's animations + break; + } if (anim_it->second == animation_id) { anim_found = TRUE; |