diff options
| author | RunitaiLinden <davep@lindenlab.com> | 2023-10-18 14:54:07 -0500 |
|---|---|---|
| committer | RunitaiLinden <davep@lindenlab.com> | 2023-10-18 14:54:07 -0500 |
| commit | 1fe76ad0b92329651b44c46667355a903854b783 (patch) | |
| tree | 404accd3a31d5fc4f601b43e981615778be6dfa8 /indra/newview/lltexturefetch.cpp | |
| parent | dedda64d70f58dcd8dcab4ecf4f2ab0fd159adf0 (diff) | |
SL-20149 Potential fix for crash when unsitting on a reflection probe. Also fix for assertion in lltexturefetch.
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); |