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

Merge https://github.com/PlayerDagostino/SingularityViewer into future

Browse Source 
Conflicts:
	indra/llplugin/llplugininstance.cpp
	indra/llwindow/llwindowsdl.cpp
	indra/llwindow/llwindowsdl.h
	indra/newview/llpreviewnotecard.cpp
	indra/newview/llviewerwindow.h
This commit is contained in:
Siana Gearz
2011-10-03 16:10:35 +02:00
parent 74dc875a27 b65da876f7
commit 9ac2c07f52
40 changed files with 986 additions and 591 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
indra/newview/lltexturefetch.cpp
View File

@@ -1380,6 +1380,12 @@ bool LLTextureFetchWorker::doWork(S32 param)
setPriority(LLWorkerThread::PRIORITY_HIGH | mWorkPriority);
return false ;
}
else
{
// UDP is not an option, we are dead
resetFormattedData();
return true; // failed
}
}
else if (mGetStatus == HTTP_SERVICE_UNAVAILABLE)
{
@@ -1402,7 +1408,9 @@ bool LLTextureFetchWorker::doWork(S32 param)
if (mHTTPFailCount >= max_attempts)
{
if (cur_size > 0)
// Make max_attempts attempt at decoding what data we have,
// then bail forever on this image
if (cur_size > 0 && (mHTTPFailCount < (max_attempts+1)) )
{
// Use available data
mLoadedDiscard = mFormattedImage->getDiscardLevel();
@@ -1411,9 +1419,21 @@ bool LLTextureFetchWorker::doWork(S32 param)
}
else
{
resetFormattedData();
mState = DONE;
return true; // failed
//roll back to try UDP
if(mCanUseNET)
{
mState = INIT ;
mCanUseHTTP = false ;
setPriority(LLWorkerThread::PRIORITY_HIGH | mWorkPriority);
return false ;
}
else
{
// UDP is not an option, we are dead
resetFormattedData();
mState = DONE;
return true; // failed
}
}
}
else