diff options
| author | RunitaiLinden <davep@lindenlab.com> | 2023-10-24 12:53:34 -0500 |
|---|---|---|
| committer | RunitaiLinden <davep@lindenlab.com> | 2023-10-24 12:53:34 -0500 |
| commit | 4cf5f34fc39cba0e9e22dcb23a23809872f652eb (patch) | |
| tree | a30c8bc6f8e170b912a64276bc99b14fd41ab164 /indra/newview | |
| parent | 4710fcf16716ab8d11f7f00e57db21d85d780bb5 (diff) | |
SL-20090 Don't use llassert_always in texture fetching code.
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llviewertexture.cpp | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/indra/newview/llviewertexture.cpp b/indra/newview/llviewertexture.cpp index 9336d99555..4a1cf0109e 100644 --- a/indra/newview/llviewertexture.cpp +++ b/indra/newview/llviewertexture.cpp @@ -1827,7 +1827,7 @@ bool LLViewerFetchedTexture::updateFetch() if (mIsMissingAsset) { LL_PROFILE_ZONE_NAMED_CATEGORY_TEXTURE("vftuf - missing asset"); - llassert_always(!mHasFetcher); + llassert(!mHasFetcher); return false; // skip } if (!mLoadedCallbackList.empty() && mRawImage.notNull()) @@ -2099,8 +2099,8 @@ bool LLViewerFetchedTexture::updateFetch() } } - llassert_always(mRawImage.notNull() || !mIsRawImageValid); - llassert_always(mRawImage.notNull() || !mNeedsCreateTexture); + llassert(mRawImage.notNull() || !mIsRawImageValid); + llassert(mRawImage.notNull() || !mNeedsCreateTexture); return mIsFetching ? true : false; } @@ -2527,8 +2527,8 @@ bool LLViewerFetchedTexture::doLoadedCallbacks() destroyRawImage(); reloadRawImage(mLoadedCallbackDesiredDiscardLevel); - llassert_always(mRawImage.notNull()); - llassert_always(!mNeedsAux || mAuxRawImage.notNull()); + llassert(mRawImage.notNull()); + llassert(!mNeedsAux || mAuxRawImage.notNull()); } // @@ -2552,7 +2552,6 @@ bool LLViewerFetchedTexture::doLoadedCallbacks() // we're going to call them. mLastCallBackActiveTime = sCurrentTime; - //llassert_always(mRawImage.notNull()); if(mNeedsAux && mAuxRawImage.isNull()) { LL_WARNS() << "Raw Image with no Aux Data for callback" << LL_ENDL; @@ -2641,9 +2640,9 @@ void LLViewerFetchedTexture::forceImmediateUpdate() LLImageRaw* LLViewerFetchedTexture::reloadRawImage(S8 discard_level) { - llassert_always(mGLTexturep.notNull()); - llassert_always(discard_level >= 0); - llassert_always(mComponents > 0); + llassert(mGLTexturep.notNull()); + llassert(discard_level >= 0); + llassert(mComponents > 0); if (mRawImage.notNull()) { |