summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErik Kundiman <erik@megapahit.org>2023-09-12 10:00:36 +0800
committerErik Kundiman <erik@megapahit.org>2023-09-12 10:00:36 +0800
commit932b63bf497089df0c1a13e0be0dee4b347da722 (patch)
treea70d21a1cccc0e9087342a125a25a47b263da8db
parentbff37ebbe4e6c09c8833f4724551c7ab76e9563b (diff)
parent0b02bf5d262fe9a6de968686420c4d525ac04077 (diff)
Merge remote-tracking branch 'secondlife/DRTVWR-559' into DRTVWR-559
-rw-r--r--indra/newview/llviewertexture.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llviewertexture.cpp b/indra/newview/llviewertexture.cpp
index cb58588848..9fc092d4b9 100644
--- a/indra/newview/llviewertexture.cpp
+++ b/indra/newview/llviewertexture.cpp
@@ -2096,7 +2096,8 @@ bool LLViewerFetchedTexture::updateFetch()
}
}
- llassert_always(mRawImage.notNull() || (!mNeedsCreateTexture && !mIsRawImageValid));
+ llassert_always(mRawImage.notNull() || !mIsRawImageValid);
+ llassert_always(mRawImage.notNull() || !mNeedsCreateTexture);
return mIsFetching ? true : false;
}