diff options
| author | RunitaiLinden <davep@lindenlab.com> | 2024-01-19 11:36:56 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-19 11:36:56 -0600 |
| commit | 6dd260c3699148b4ddf8e7bff84f4b19f8bbf076 (patch) | |
| tree | 6c9144f701ecb2cda859baaeed4e2f4ee6f9a683 /indra/newview/lltexturefetch.cpp | |
| parent | 45547c7bbadf15804f54bb28fd1c94eb5f080bf5 (diff) | |
| parent | 09ee84f675cf08f98cbd49516c5e01c289b42a20 (diff) | |
Merge branch 'release/materials_featurette' into DRTVWR-592
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); |