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

Revert "HTTP GET fix, bisected from Techwolf's patches. Thanks :)"

Browse Source 
This reverts commit 29584c7a28.
This commit is contained in:
Siana Gearz
2010-11-18 20:22:20 +01:00
parent d5fee73c42
commit e9296374cf
1 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
indra/newview/lltexturefetch.cpp
View File

@@ -861,7 +861,7 @@ bool LLTextureFetchWorker::doWork(S32 param)
(mFetcher->getTextureBandwidth() > max_bandwidth)) (mFetcher->getTextureBandwidth() > max_bandwidth))
{ {
// Make normal priority and return (i.e. wait until there is room in the queue) // Make normal priority and return (i.e. wait until there is room in the queue)
// setPriority(LLWorkerThread::PRIORITY_NORMAL | mWorkPriority); setPriority(LLWorkerThread::PRIORITY_NORMAL | mWorkPriority);
return false; return false;
} }
@@ -870,10 +870,6 @@ bool LLTextureFetchWorker::doWork(S32 param)
{ {
cur_size = mFormattedImage->getDataSize(); // amount of data we already have cur_size = mFormattedImage->getDataSize(); // amount of data we already have
} }
resetFormattedData(); // discard any previous data we had
cur_size = 0 ;
mRequestedSize = mDesiredSize; mRequestedSize = mDesiredSize;
mRequestedDiscard = mDesiredDiscard; mRequestedDiscard = mDesiredDiscard;
mRequestedSize -= cur_size; mRequestedSize -= cur_size;
@@ -1156,8 +1152,8 @@ bool LLTextureFetchWorker::doWork(S32 param)
if(mDecodedDiscard<=0) if(mDecodedDiscard<=0)
{ {
return true; return true;
} }
else else
{ {
return false; return false;
@@ -1335,16 +1331,22 @@ void LLTextureFetchWorker::callbackHttpGet(const LLChannelDescriptors& channels,
if (data_size > 0) if (data_size > 0)
{ {
// *TODO: set the formatted image data here directly to avoid the copy // *TODO: set the formatted image data here directly to avoid the copy
llassert_always(mBuffer == NULL);
mBuffer = new U8[data_size]; mBuffer = new U8[data_size];
buffer->readAfter(channels.in(), NULL, mBuffer, data_size); buffer->readAfter(channels.in(), NULL, mBuffer, data_size);
mBufferSize += data_size; mBufferSize += data_size;
if (data_size < mRequestedSize && if (data_size < mRequestedSize || last_block == true)
(mRequestedDiscard == 0 || last_block == true) )
{ {
mHaveAllData = TRUE; mHaveAllData = TRUE;
} }
llassert_always(data_size <= mRequestedSize); else if (data_size > mRequestedSize)
{
// *TODO: This shouldn't be happening any more
llwarns << "data_size = " << data_size << " > requested: " << mRequestedSize << llendl;
mHaveAllData = TRUE;
llassert_always(mDecodeHandle == 0);
mFormattedImage = NULL; // discard any previous data we had
mBufferSize = data_size;
}
} }
else else
{ {