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

Henri's HTTP pipeline, with SG twist

Browse Source
This commit is contained in:
Siana Gearz
2010-12-30 20:27:26 +01:00
parent e31c21fc54
commit 5fd5049e9b
15 changed files with 1102 additions and 584 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
indra/newview/llviewerimage.cpp
View File

@@ -1026,8 +1026,7 @@ bool LLViewerImage::updateFetch()
S32 current_discard = getDiscardLevel();
S32 desired_discard = getDesiredDiscardLevel();
F32 decode_priority = getDecodePriority();
decode_priority = llmax(decode_priority, 0.0f);
decode_priority = llmin(decode_priority, maxDecodePriority());
decode_priority = llclamp(decode_priority, 0.0f, maxDecodePriority());
if (mIsFetching)
{
@@ -1053,7 +1052,7 @@ bool LLViewerImage::updateFetch()
else
{
mFetchState = LLAppViewer::getTextureFetch()->getFetchState(mID, mDownloadProgress, mRequestedDownloadPriority,
mFetchPriority, mFetchDeltaTime, mRequestDeltaTime);
mFetchPriority, mFetchDeltaTime, mRequestDeltaTime, mCanUseHTTP);
}
// We may have data ready regardless of whether or not we are finished (e.g. waiting on write)
@@ -1200,7 +1199,7 @@ bool LLViewerImage::updateFetch()
mRequestedDiscardLevel = desired_discard;
mFetchState = LLAppViewer::getTextureFetch()->getFetchState(mID, mDownloadProgress, mRequestedDownloadPriority,
mFetchPriority, mFetchDeltaTime, mRequestDeltaTime);
mFetchPriority, mFetchDeltaTime, mRequestDeltaTime, mCanUseHTTP);
}
// if createRequest() failed, we're finishing up a request for this UUID,
@@ -1282,7 +1281,7 @@ BOOL LLViewerImage::forceFetch()
mRequestedDiscardLevel = desired_discard ;
mFetchState = LLAppViewer::getTextureFetch()->getFetchState(mID, mDownloadProgress, mRequestedDownloadPriority,
mFetchPriority, mFetchDeltaTime, mRequestDeltaTime);
mFetchPriority, mFetchDeltaTime, mRequestDeltaTime, mCanUseHTTP);
}
return mIsFetching ? true : false;