diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-02-03 15:17:51 +0200 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-02-03 15:17:51 +0200 |
| commit | e58b5263598368b6dec4a836c72c69b50d701911 (patch) | |
| tree | d454f4ed2089cef10d6033f3780476b146e3dd7e /indra/newview/llagentwearables.cpp | |
| parent | 95af08341c5b20e7faeb58a4d39fae5d8b25fcee (diff) | |
| parent | a52ef7ad60c8821fcb412988d838b58c0414ac8f (diff) | |
Merge branch 'DRTVWR-500' into DRTVWR-501
Diffstat (limited to 'indra/newview/llagentwearables.cpp')
| -rw-r--r-- | indra/newview/llagentwearables.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llagentwearables.cpp b/indra/newview/llagentwearables.cpp index 15e4de8f69..013c40f557 100644 --- a/indra/newview/llagentwearables.cpp +++ b/indra/newview/llagentwearables.cpp @@ -1323,7 +1323,7 @@ void LLAgentWearables::findAttachmentsAddRemoveInfo(LLInventoryModel::item_array attachment_iter != attachment->mAttachedObjects.end(); ++attachment_iter) { - LLViewerObject *objectp = (*attachment_iter); + LLViewerObject *objectp = attachment_iter->get(); if (objectp) { LLUUID object_item_id = objectp->getAttachmentItemID(); @@ -1387,7 +1387,7 @@ std::vector<LLViewerObject*> LLAgentWearables::getTempAttachments() attachment_iter != attachment->mAttachedObjects.end(); ++attachment_iter) { - LLViewerObject *objectp = (*attachment_iter); + LLViewerObject *objectp = attachment_iter->get(); if (objectp && objectp->isTempAttachment()) { temp_attachs.push_back(objectp); |