diff options
| author | Nyx Linden <nyx@lindenlab.com> | 2013-03-20 12:15:27 -0400 |
|---|---|---|
| committer | Nyx Linden <nyx@lindenlab.com> | 2013-03-20 12:15:27 -0400 |
| commit | 33954bbbe5517a0ad72ffc6bad7cb94985b3bf8b (patch) | |
| tree | bfc3b031000007362e22bc8d2c3881f34489d0f9 /indra/newview/llviewertexture.cpp | |
| parent | 626cb6319945f6ff8feee2aec862924581a66056 (diff) | |
| parent | 779e132cbfc46a0eda97a0331e39cbc6e686c07b (diff) | |
merging in changes from sunshine-stable
Diffstat (limited to 'indra/newview/llviewertexture.cpp')
| -rw-r--r-- | indra/newview/llviewertexture.cpp | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/indra/newview/llviewertexture.cpp b/indra/newview/llviewertexture.cpp index 1d0bda34a7..236b95253c 100644 --- a/indra/newview/llviewertexture.cpp +++ b/indra/newview/llviewertexture.cpp @@ -1819,7 +1819,10 @@ bool LLViewerFetchedTexture::updateFetch() // We finished but received no data if (current_discard < 0) { - llwarns << "!mIsFetching, setting as missing" << llendl; + llwarns << "!mIsFetching, setting as missing, decode_priority " << decode_priority + << " mRawDiscardLevel " << mRawDiscardLevel + << " current_discard " << current_discard + << llendl; setIsMissingAsset(); desired_discard = -1; } @@ -1952,11 +1955,13 @@ bool LLViewerFetchedTexture::updateFetch() } else if (mHasFetcher && !mIsFetching) { - // Only delete requests that haven't receeived any network data for a while + // Only delete requests that haven't received any network data + // for a while. Note - this is the normal mechanism for + // deleting requests, not just a place to handle timeouts. const F32 FETCH_IDLE_TIME = 5.f; if (mLastPacketTimer.getElapsedTimeF32() > FETCH_IDLE_TIME) { -// llinfos << "Deleting request: " << getID() << " Discard: " << current_discard << " <= min:" << mMinDiscardLevel << " or priority == 0: " << decode_priority << llendl; + LL_DEBUGS("Texture") << "exceeded idle time " << FETCH_IDLE_TIME << ", deleting request: " << getID() << llendl; LLAppViewer::getTextureFetch()->deleteRequest(getID(), true); mHasFetcher = FALSE; } |