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

Merge branch 'curlthreading2' into curlthreading3

Browse Source
This commit is contained in:
Aleric Inglewood
2012-09-06 15:12:22 +02:00
parent 83b13f6a3f e3752aefed
commit e7cd445491
4070 changed files with 25269 additions and 20661 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/lltexturefetch.cpp
View File

@@ -932,7 +932,7 @@ void LLTextureFetchWorker::startWork(S32 param)
// Called from LLWorkerThread::processRequest()
bool LLTextureFetchWorker::doWork(S32 param)
{
static const F32 FETCHING_TIMEOUT = 120.f;//seconds
static const F32 FETCHING_TIMEOUT = 15.f;//seconds
LLMutexLock lock(&mWorkMutex);