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

Merge branch 'master' of https://github.com/Shyotl/SingularityViewer

Browse Source
This commit is contained in:
Siana Gearz
2012-12-09 03:27:52 +01:00
parent d2a966f363 8a7cc9259c
commit 98ec8b9910
295 changed files with 8534 additions and 6358 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
indra/newview/lltexturefetch.cpp
View File

@@ -408,7 +408,7 @@ public:
}
}
virtual bool followRedir()
/*virtual*/ bool followRedir() const
{
return mFollowRedir;
}
@@ -2223,27 +2223,21 @@ void LLTextureFetch::deleteRequest(const LLUUID& id, bool cancel)
{
lockQueue() ;
LLTextureFetchWorker* worker = getWorkerAfterLock(id);
if (worker)
{
size_t erased_1 = mRequestMap.erase(worker->mID);
unlockQueue() ;
llassert_always(erased_1 > 0) ;
removeFromNetworkQueue(worker, cancel);
llassert_always(!(worker->getFlags(LLWorkerClass::WCF_DELETE_REQUESTED))) ;
worker->scheduleDelete();
}
else
{
unlockQueue() ;
}
removeRequest(worker, cancel, false);
}
void LLTextureFetch::removeRequest(LLTextureFetchWorker* worker, bool cancel)
void LLTextureFetch::removeRequest(LLTextureFetchWorker* worker, bool cancel, bool bNeedsLock)
{
lockQueue() ;
if(!worker)
{
if(!bNeedsLock)
unlockQueue() ;
return;
}
if(bNeedsLock)
lockQueue() ;
size_t erased_1 = mRequestMap.erase(worker->mID);
unlockQueue() ;
@@ -2254,6 +2248,23 @@ void LLTextureFetch::removeRequest(LLTextureFetchWorker* worker, bool cancel)
worker->scheduleDelete();
}
void LLTextureFetch::deleteAllRequests()
{
while(1)
{
lockQueue();
if(mRequestMap.empty())
{
unlockQueue() ;
break;
}
LLTextureFetchWorker* worker = mRequestMap.begin()->second;
removeRequest(worker, true, false);
}
}
S32 LLTextureFetch::getNumRequests()
{
lockQueue() ;