diff options
| author | Erik Kundiman <erik@megapahit.org> | 2023-10-26 10:01:52 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2023-10-26 10:01:52 +0800 |
| commit | 281ca5330e5e1b46268a0bea68af1cdb4270d512 (patch) | |
| tree | 16d00c08fe3484bdd6f2e376efeadda340e1c582 /indra/newview/llviewertexture.cpp | |
| parent | 92fedbc11e2d69bd51660e24956984cf2503ec71 (diff) | |
| parent | 3ecce24f9f1a930f9765920a2818e5f5081d696c (diff) | |
Merge remote-tracking branch 'secondlife/DRTVWR-559' into DRTVWR-559
Diffstat (limited to 'indra/newview/llviewertexture.cpp')
| -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()) { |