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

Merge branch 'animesh' of https://github.com/RouterGray/SingularityViewer into animesh

Browse Source
This commit is contained in:
Liru Færs
2019-08-25 17:21:56 -04:00
parent 2c3e37024e c90c303fd4
commit bc99ceee12
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
indra/newview/llviewertexturelist.cpp
View File

@@ -602,7 +602,7 @@ LLViewerFetchedTexture* LLViewerTextureList::createImage(const LLUUID &image_id,
LLViewerFetchedTexture *LLViewerTextureList::findImage(const LLUUID &image_id) LLViewerFetchedTexture *LLViewerTextureList::findImage(const LLUUID &image_id)
{ {
// Singu note: Reworked hotspot // Singu note: Reworked hotspot
auto& iter = mUUIDDict.find(image_id); const auto& iter = mUUIDDict.find(image_id);
if(iter == mUUIDDict.end()) if(iter == mUUIDDict.end())
return NULL; return NULL;
return iter->second; return iter->second;
@@ -650,7 +650,7 @@ void LLViewerTextureList::removeImageFromList(LLViewerFetchedTexture *image)
<< " but doesn't have mInImageList set" << " but doesn't have mInImageList set"
<< " ref count is " << image->getNumRefs() << " ref count is " << image->getNumRefs()
<< LL_ENDL; << LL_ENDL;
auto& iter = mUUIDDict.find(image->getID()); const auto& iter = mUUIDDict.find(image->getID());
if(iter == mUUIDDict.end()) if(iter == mUUIDDict.end())
{ {
LL_INFOS() << "Image " << image->getID() << " is also not in mUUIDMap!" << LL_ENDL ; LL_INFOS() << "Image " << image->getID() << " is also not in mUUIDMap!" << LL_ENDL ;