livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MAINT-8593 Viewer should not repeat mesh dowloads indefinetely

master
Andrey Kleshchev 2018-05-04 15:46:05 +00:00
parent 815067ae29
commit 0abe3a4919
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
indra/newview/llmeshrepository.cpp
View File

@ -982,7 +982,7 @@ void LLMeshRepoThread::run()
// failed to load before, wait a bit
incomplete.push_front(req);
}
else if (!fetchMeshHeader(req.mMeshParams, req.getRetries()))
else if (!fetchMeshHeader(req.mMeshParams, req.canRetry()))
{
if (req.canRetry())
{
@ -1071,14 +1071,14 @@ void LLMeshRepoThread::run()
mMutex->unlock();
if (req.isDelayed())
{
incomplete.insert(req.mId);
incomplete.insert(req);
}
else if (!fetchMeshDecomposition(req.mId))
{
if (req.canRetry())
{
req.updateTime();
incomplete.insert(req.mId);
incomplete.insert(req);
}
else
{
@ -1097,7 +1097,7 @@ void LLMeshRepoThread::run()
// holding lock, final list
if (!mPhysicsShapeRequests.empty())
{
std::set<LLUUID> incomplete;
std::set<UUIDBasedRequest> incomplete;
while (!mPhysicsShapeRequests.empty() && mHttpRequestSet.size() < sRequestHighWater)
{
mMutex->lock();
@ -1107,14 +1107,14 @@ void LLMeshRepoThread::run()
mMutex->unlock();
if (req.isDelayed())
{
incomplete.insert(req.mId);
incomplete.insert(req);
}
else if (!fetchMeshPhysicsShape(req.mId))
{
if (req.canRetry())
{
req.updateTime();
incomplete.insert(req.mId);
incomplete.insert(req);
}
else
{