diff options
author | Rider Linden <rider@lindenlab.com> | 2023-10-23 14:42:19 -0700 |
---|---|---|
committer | Rider Linden <rider@lindenlab.com> | 2023-10-25 10:15:07 -0700 |
commit | 936b66b8307fee405a43a11b579a0178958111a4 (patch) | |
tree | a532b1d7139aa9e565483c43def5dcbb9a8ab8e0 /indra | |
parent | a1695760821b4d19af204918a1764d9fca3e99b9 (diff) |
SL-20517: When attempting to find orphans, if an object claims to be its own parent the viewer logs a warning and then continues the loop without incrementing the iterator. This increments the iterator so that loop processing can continue and the viewer does not get stuck on the bad object.
Diffstat (limited to 'indra')
-rw-r--r-- | indra/newview/llviewerobjectlist.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llviewerobjectlist.cpp b/indra/newview/llviewerobjectlist.cpp index c479afaa52..e3658b9368 100644 --- a/indra/newview/llviewerobjectlist.cpp +++ b/indra/newview/llviewerobjectlist.cpp @@ -2200,6 +2200,7 @@ void LLViewerObjectList::findOrphans(LLViewerObject* objectp, U32 ip, U32 port) { LL_WARNS() << objectp->mID << " has self as parent, skipping!" << LL_ENDL; + ++iter; continue; } |