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/llagentcamera.cpp | |
| parent | 95af08341c5b20e7faeb58a4d39fae5d8b25fcee (diff) | |
| parent | a52ef7ad60c8821fcb412988d838b58c0414ac8f (diff) | |
Merge branch 'DRTVWR-500' into DRTVWR-501
Diffstat (limited to 'indra/newview/llagentcamera.cpp')
| -rw-r--r-- | indra/newview/llagentcamera.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llagentcamera.cpp b/indra/newview/llagentcamera.cpp index c55c12e670..85b7d7b06f 100644 --- a/indra/newview/llagentcamera.cpp +++ b/indra/newview/llagentcamera.cpp @@ -1460,7 +1460,7 @@ void LLAgentCamera::updateCamera() attachment_iter != attachment->mAttachedObjects.end(); ++attachment_iter) { - LLViewerObject *attached_object = (*attachment_iter); + LLViewerObject *attached_object = attachment_iter->get(); if (attached_object && !attached_object->isDead() && attached_object->mDrawable.notNull()) { // clear any existing "early" movements of attachment |