From fce97c4aae6a6b21fb89961cdbb84dbbeee8fcf7 Mon Sep 17 00:00:00 2001 From: Ansariel Date: Sat, 2 Apr 2016 04:37:21 +0200 Subject: [PATCH] Build fix --- indra/newview/daeexport.cpp | 2 +- indra/newview/llvoavatar.cpp | 2 +- indra/newview/llworldmap.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/indra/newview/daeexport.cpp b/indra/newview/daeexport.cpp index 87d576951e..c9f3a9f7f3 100644 --- a/indra/newview/daeexport.cpp +++ b/indra/newview/daeexport.cpp @@ -486,7 +486,7 @@ void ColladaExportFloater::CacheReadResponder::saveTexturesWorker(void* data) } LLUUID id = me->mTexturesToSave.begin()->first; - LLViewerTexture* imagep = LLViewerTextureManager::findFetchedTexture(id, TEX_LIST_DISCARD); + LLViewerTexture* imagep = LLViewerTextureManager::findFetchedTexture(id, TEX_LIST_STANDARD); if (!imagep) { me->mTexturesToSave.erase(id); diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp index f6e269bb60..eea4a96209 100644 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp @@ -9384,7 +9384,7 @@ void LLVOAvatar::bakedTextureOriginCounts(S32 &sb_count, // server-bake, has ori collectBakedTextureUUIDs(baked_ids); for (std::set::const_iterator it = baked_ids.begin(); it != baked_ids.end(); ++it) { - LLViewerFetchedTexture *imagep = gTextureList.findImage(*it, TEX_LIST_DISCARD); + LLViewerFetchedTexture *imagep = gTextureList.findImage(*it, TEX_LIST_STANDARD); bool has_url = false, has_host = false; if (!imagep->getUrl().empty()) { diff --git a/indra/newview/llworldmap.cpp b/indra/newview/llworldmap.cpp index 7ccf03f7f4..02589c1b34 100755 --- a/indra/newview/llworldmap.cpp +++ b/indra/newview/llworldmap.cpp @@ -87,7 +87,7 @@ void LLSimInfo::setLandForSaleImage (LLUUID image_id) // Aurora Sim if (mMapImageID.isNull() && image_id.notNull()) { - mOverlayImage = LLViewerTextureManager::findFetchedTexture(image_id, TEX_LIST_DISCARD); + mOverlayImage = LLViewerTextureManager::findFetchedTexture(image_id, TEX_LIST_STANDARD); if(mOverlayImage.notNull()) { LLAppViewer::getTextureCache()->removeFromCache(image_id);