From cd02bbd1cb3b2ec3367282cc5b9d586e26d2ed59 Mon Sep 17 00:00:00 2001 From: Lirusaito Date: Wed, 6 Mar 2019 16:10:31 -0500 Subject: [PATCH] Fix mixed iterators Thanks Aru --- indra/llrender/llshadermgr.cpp | 2 +- indra/newview/llvoavatar.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/indra/llrender/llshadermgr.cpp b/indra/llrender/llshadermgr.cpp index 37a0ea424..636fb18ef 100644 --- a/indra/llrender/llshadermgr.cpp +++ b/indra/llrender/llshadermgr.cpp @@ -985,7 +985,7 @@ void LLShaderMgr::cleanupShaderSources() for (GLsizei i = 0; i < count; ++i) { std::multimap::iterator it = mShaderObjects.begin(); - for (; it != LLShaderMgr::instance()->mShaderObjects.end(); it++) + for (; it != mShaderObjects.end(); it++) { if ((*it).second.mHandle == shaders[i]) { diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp index 61f38fe8f..6715b302b 100644 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp @@ -7677,7 +7677,7 @@ LLViewerObject* LLVOAvatar::getWornAttachment( const LLUUID& inv_item_id ) LLViewerObject * LLVOAvatar::findAttachmentByID( const LLUUID & target_id ) const { for(attachment_map_t::const_iterator attachment_points_iter = mAttachmentPoints.begin(); - attachment_points_iter != gAgentAvatarp->mAttachmentPoints.end(); + attachment_points_iter != mAttachmentPoints.end(); ++attachment_points_iter) { LLViewerJointAttachment* attachment = attachment_points_iter->second;