diff options
| author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2019-11-12 04:24:35 +0200 |
|---|---|---|
| committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2019-11-12 04:24:35 +0200 |
| commit | 91fa31c065a582b9ead8a3d2f537c9b3d72474ee (patch) | |
| tree | 50a83e42321a2b611df7c8e3f72ef452f868c591 /indra/newview/llviewerobjectlist.cpp | |
| parent | 2d69438ee37a2224698418c2d00b19015b70b2b5 (diff) | |
| parent | f13cc44f8999a9897c77411d1296582b7bc1f08d (diff) | |
Downstream merge from lindenlab/viewer-serval
Diffstat (limited to 'indra/newview/llviewerobjectlist.cpp')
| -rw-r--r-- | indra/newview/llviewerobjectlist.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewerobjectlist.cpp b/indra/newview/llviewerobjectlist.cpp index 2bf04dc204..63e48d1dd0 100644 --- a/indra/newview/llviewerobjectlist.cpp +++ b/indra/newview/llviewerobjectlist.cpp @@ -1921,7 +1921,7 @@ void LLViewerObjectList::generatePickList(LLCamera &camera) attachment_iter != attachment->mAttachedObjects.end(); ++attachment_iter) { - if (LLViewerObject* attached_object = (*attachment_iter)) + if (LLViewerObject* attached_object = attachment_iter->get()) { mSelectPickList.insert(attached_object); LLViewerObject::const_child_list_t& child_list = attached_object->getChildren(); |