summaryrefslogtreecommitdiff
path: root/indra/newview/llviewertexture.cpp
diff options
context:
space:
mode:
authorDave Houlton <euclid@lindenlab.com>2022-02-01 15:49:32 -0700
committerDave Houlton <euclid@lindenlab.com>2022-02-01 15:49:32 -0700
commitfdc4a81b578f26ce573d6b60760c8235312a6372 (patch)
tree0ee6880004038bd6af925b9e8bd0b1d4cd4f4cd3 /indra/newview/llviewertexture.cpp
parent795a349b9f44183970b1e8abc632c4d7f8bbea37 (diff)
Revert "Merged in euclid-16418 (pull request #846)"
This reverts commit 40fe5277e1390c975d9a3184ff8fc46d69dfb450, reversing changes made to af830e5fc5840194be95140f644a27011b9b7e06.
Diffstat (limited to 'indra/newview/llviewertexture.cpp')
-rw-r--r--indra/newview/llviewertexture.cpp2
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(