Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fatal paranoia cure

Browse Source
This commit is contained in:
Siana Gearz
2013-12-09 03:39:47 +01:00
parent 340286f918
commit e182173ee2
3 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
indra/newview/llviewertexture.cpp
View File

@@ -1270,7 +1270,7 @@ BOOL LLViewerFetchedTexture::createTexture(S32 usename/*= 0*/)
mNeedsCreateTexture = FALSE;
if (mRawImage.isNull())
{
llerrs << "LLViewerTexture trying to create texture with no Raw Image" << llendl;
llwarns << "LLViewerTexture trying to create texture with no Raw Image" << llendl;
}
// llinfos << llformat("IMAGE Creating (%d) [%d x %d] Bytes: %d ",
// mRawDiscardLevel,
@@ -1712,7 +1712,7 @@ bool LLViewerFetchedTexture::updateFetch()
}
if (mIsMissingAsset)
{
llassert_always(!mHasFetcher);
llassert(!mHasFetcher);
return false; // skip
}
if (!mLoadedCallbackList.empty() && mRawImage.notNull())
@@ -1942,8 +1942,8 @@ bool LLViewerFetchedTexture::updateFetch()
mHasFetcher = FALSE;
}
}
llassert_always(mRawImage.notNull() || (!mNeedsCreateTexture && !mIsRawImageValid));
llassert(mRawImage.notNull() || (!mNeedsCreateTexture && !mIsRawImageValid));
return mIsFetching ? true : false;
}