Skip to content

Commit 38845a1

Browse files
committed
viewer#3147 Thumbnail picker's image is grey
when both thumnail and normal image attempt to fetch, one creates a fetcher, another fails, since fetcher is already there, potentially in a transitional state, so it thinks fetch failed.
1 parent 3d9ee40 commit 38845a1

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

indra/newview/llviewertexture.cpp

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1965,7 +1965,9 @@ bool LLViewerFetchedTexture::updateFetch()
19651965

19661966
if (!mIsFetching)
19671967
{
1968-
if ((decode_priority > 0) && (mRawDiscardLevel < 0 || mRawDiscardLevel == INVALID_DISCARD_LEVEL))
1968+
if ((decode_priority > 0)
1969+
&& (mRawDiscardLevel < 0 || mRawDiscardLevel == INVALID_DISCARD_LEVEL)
1970+
&& mFetchState > 1) // 1 - initial, make sure fetcher did at least something
19691971
{
19701972
// We finished but received no data
19711973
if (getDiscardLevel() < 0)
@@ -2003,6 +2005,9 @@ bool LLViewerFetchedTexture::updateFetch()
20032005
{
20042006
// We have data, but our fetch failed to return raw data
20052007
// *TODO: FIgure out why this is happening and fix it
2008+
// Potentially can happen when TEX_LIST_SCALE and TEX_LIST_STANDARD
2009+
// get requested for the same texture id at the same time
2010+
// (two textures, one fetcher)
20062011
destroyRawImage();
20072012
}
20082013
}

0 commit comments

Comments
 (0)