diff options
| author | andreykproductengine <akleshchev@productengine.com> | 2016-02-29 19:23:47 +0200 |
|---|---|---|
| committer | andreykproductengine <akleshchev@productengine.com> | 2016-02-29 19:23:47 +0200 |
| commit | 6a37e654ef5c79b59c66f69f97ca99254b956145 (patch) | |
| tree | 1d672b007d7c7263d51e75e322870f651488cf0d /indra/newview/lltexturefetch.cpp | |
| parent | ed608e2d5b4923764043f2223da84c74983ded92 (diff) | |
| parent | f4e3306517599754f8b4e74e7f97c98dfbcc8429 (diff) | |
Merge from viewer-lynx and conflict resolution
Diffstat (limited to 'indra/newview/lltexturefetch.cpp')
| -rwxr-xr-x | indra/newview/lltexturefetch.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/lltexturefetch.cpp b/indra/newview/lltexturefetch.cpp index 27d754bed2..bb93597651 100755 --- a/indra/newview/lltexturefetch.cpp +++ b/indra/newview/lltexturefetch.cpp @@ -4460,7 +4460,7 @@ void LLTextureFetchDebugger::addHistoryEntry(LLTextureFetchWorker* worker) mRefetchedAllData += worker->mFormattedImage->getDataSize(); // refetch list only requests/creates normal images, so requesting ui='false' - LLViewerFetchedTexture* tex = LLViewerTextureManager::findFetchedTexture(worker->mID, TEX_LIST_DISCARD); + LLViewerFetchedTexture* tex = LLViewerTextureManager::findFetchedTexture(worker->mID, TEX_LIST_STANDARD); if(tex && mRefetchList[tex].begin() != mRefetchList[tex].end()) { if(worker->mDecodedDiscard == mFetchingHistory[mRefetchList[tex][0]].mDecodedLevel) |