Skip to content

Commit 254ecf4

Browse files
committed
p#475 Excessive texture fetch logging on shutdown
1 parent 6ea4fc9 commit 254ecf4

File tree

1 file changed

+13
-4
lines changed

1 file changed

+13
-4
lines changed

indra/newview/lltexturefetch.cpp

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1295,10 +1295,19 @@ bool LLTextureFetchWorker::doWork(S32 param)
12951295
else
12961296
{
12971297
mCanUseCapability = false;
1298-
mRegionRetryAttempt++;
1299-
mRegionRetryTimer.setTimerExpirySec(CAP_MISSING_EXPIRATION_DELAY);
1300-
// ex: waiting for caps
1301-
LL_INFOS_ONCE(LOG_TXT) << "Texture not available via HTTP: empty URL." << LL_ENDL;
1298+
if (gDisconnected)
1299+
{
1300+
// We lost connection or are shutting down.
1301+
mCanUseHTTP = false;
1302+
return true; // abort
1303+
}
1304+
else
1305+
{
1306+
// Ex: waiting for caps
1307+
mRegionRetryAttempt++;
1308+
mRegionRetryTimer.setTimerExpirySec(CAP_MISSING_EXPIRATION_DELAY);
1309+
LL_INFOS_ONCE(LOG_TXT) << "Texture not available via HTTP: empty URL." << LL_ENDL;
1310+
}
13021311
}
13031312
}
13041313
else

0 commit comments

Comments
 (0)