diff options
| author | Euclid Linden <euclid@lindenlab.com> | 2022-02-02 00:34:05 +0000 |
|---|---|---|
| committer | Michael Pohoreski <ptolemy@lindenlab.com> | 2022-02-02 00:34:05 +0000 |
| commit | e6d44588d00d32e8ded5a69c29cd9ab5d78407df (patch) | |
| tree | 0ee6880004038bd6af925b9e8bd0b1d4cd4f4cd3 /indra/newview/llviewertexture.cpp | |
| parent | 0b850360f5f3e520fa3bd321e2e105c24d1f46f0 (diff) | |
| parent | fdc4a81b578f26ce573d6b60760c8235312a6372 (diff) | |
Merged in revert-16418 (pull request #854)
Revert SL-16418 commits
Approved-by: Michael Pohoreski
Diffstat (limited to 'indra/newview/llviewertexture.cpp')
| -rw-r--r-- | indra/newview/llviewertexture.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewertexture.cpp b/indra/newview/llviewertexture.cpp index ccf4c5bbec..5fed46f437 100644 --- a/indra/newview/llviewertexture.cpp +++ b/indra/newview/llviewertexture.cpp @@ -1629,6 +1629,7 @@ void LLViewerFetchedTexture::scheduleCreateTexture() mNeedsCreateTexture = TRUE; if (preCreateTexture()) { + ref(); #if LL_IMAGEGL_THREAD_CHECK //grab a copy of the raw image data to make sure it isn't modified pending texture creation U8* data = mRawImage->getData(); @@ -1642,7 +1643,6 @@ void LLViewerFetchedTexture::scheduleCreateTexture() #endif mNeedsCreateTexture = TRUE; auto mainq = LLImageGLThread::sEnabled ? mMainQueue.lock() : nullptr; - ref(); // protect texture from deletion while active on bg queue if (mainq) { mainq->postTo( |