Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix mixed iterators

Browse Source 
Thanks Aru
This commit is contained in:
Lirusaito
2019-03-06 16:10:31 -05:00
parent 22609412e4
commit cd02bbd1cb
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
indra/llrender/llshadermgr.cpp
View File

@@ -985,7 +985,7 @@ void LLShaderMgr::cleanupShaderSources()
for (GLsizei i = 0; i < count; ++i) for (GLsizei i = 0; i < count; ++i)
{ {
std::multimap<std::string, LLShaderMgr::CachedObjectInfo>::iterator it = mShaderObjects.begin(); std::multimap<std::string, LLShaderMgr::CachedObjectInfo>::iterator it = mShaderObjects.begin();
for (; it != LLShaderMgr::instance()->mShaderObjects.end(); it++) for (; it != mShaderObjects.end(); it++)
{ {
if ((*it).second.mHandle == shaders[i]) if ((*it).second.mHandle == shaders[i])
{ {

2
indra/newview/llvoavatar.cpp
View File

@@ -7677,7 +7677,7 @@ LLViewerObject* LLVOAvatar::getWornAttachment( const LLUUID& inv_item_id )
LLViewerObject * LLVOAvatar::findAttachmentByID( const LLUUID & target_id ) const LLViewerObject * LLVOAvatar::findAttachmentByID( const LLUUID & target_id ) const
{ {
for(attachment_map_t::const_iterator attachment_points_iter = mAttachmentPoints.begin(); 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) ++attachment_points_iter)
{ {
LLViewerJointAttachment* attachment = attachment_points_iter->second; LLViewerJointAttachment* attachment = attachment_points_iter->second;