diff options
| author | Erik Kundiman <erik@megapahit.org> | 2023-10-19 11:59:25 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2023-10-19 11:59:25 +0800 |
| commit | 50d273aa3011fa7655575c89d4bd36dce9d2ff16 (patch) | |
| tree | 18aaa69ad9c8182446b21128aa453309d6df1c2e /indra/newview/lltexturefetch.cpp | |
| parent | aafaba28c223681db8f9a4076193b167a91c4924 (diff) | |
| parent | baaf698e29e487244863dc08661fa6754ebd1408 (diff) | |
Merge remote-tracking branch 'secondlife/DRTVWR-559' into DRTVWR-559
Diffstat (limited to 'indra/newview/lltexturefetch.cpp')
| -rw-r--r-- | indra/newview/lltexturefetch.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/lltexturefetch.cpp b/indra/newview/lltexturefetch.cpp index e669393dba..38c9b3717d 100644 --- a/indra/newview/lltexturefetch.cpp +++ b/indra/newview/lltexturefetch.cpp @@ -1379,7 +1379,9 @@ bool LLTextureFetchWorker::doWork(S32 param) // // If it looks like we're busy, keep this request here. // Otherwise, advance into the HTTP states. - if (mFetcher->getHttpWaitersCount() || ! acquireHttpSemaphore()) + + if (!mHttpHasResource && // sometimes we get into this state when we already have an http resource, go ahead and send the request in that case + (mFetcher->getHttpWaitersCount() || ! acquireHttpSemaphore())) { setState(WAIT_HTTP_RESOURCE2); mFetcher->addHttpWaiter(this->mID); |