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

4
indra/llcharacter/llkeyframemotion.cpp
View File

@@ -484,7 +484,9 @@ LLJoint* LLKeyframeMotion::getJoint(U32 index)
index = (S32)mJointStates.size() - 1; index = (S32)mJointStates.size() - 1;
// </edit> // </edit>
LLJoint* joint = mJointStates[index]->getJoint(); LLJoint* joint = mJointStates[index]->getJoint();
llassert_always (joint); if(!joint) {
LL_WARNS_ONCE("Animation") << "Missing joint index:"<< index << " ID:" << mID << " Name:" << mName << LL_ENDL;
}
return joint; return joint;
} }

17
indra/newview/llappviewer.cpp
View File

@@ -2972,14 +2972,17 @@ void LLAppViewer::removeMarkerFile(bool leave_logout_marker)
mMarkerFile.close() ; mMarkerFile.close() ;
LLAPRFile::remove( mMarkerFileName ); LLAPRFile::remove( mMarkerFileName );
} }
if (mLogoutMarkerFile != NULL && !leave_logout_marker) if (mLogoutMarkerFile != NULL)
{ {
LLAPRFile::remove( mLogoutMarkerFileName ); if(!leave_logout_marker)
mLogoutMarkerFile = NULL; {
} LLAPRFile::remove( mLogoutMarkerFileName );
else mLogoutMarkerFile = NULL;
{ }
LL_WARNS("MarkerFile") << "leaving markers because this is a second instance" << LL_ENDL; else
{
LL_WARNS("MarkerFile") << "leaving markers because this is a second instance" << LL_ENDL;
}
} }
} }

8
indra/newview/llviewertexture.cpp
View File

@@ -1270,7 +1270,7 @@ BOOL LLViewerFetchedTexture::createTexture(S32 usename/*= 0*/)
mNeedsCreateTexture = FALSE; mNeedsCreateTexture = FALSE;
if (mRawImage.isNull()) 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 ", // llinfos << llformat("IMAGE Creating (%d) [%d x %d] Bytes: %d ",
// mRawDiscardLevel, // mRawDiscardLevel,
@@ -1712,7 +1712,7 @@ bool LLViewerFetchedTexture::updateFetch()
} }
if (mIsMissingAsset) if (mIsMissingAsset)
{ {
llassert_always(!mHasFetcher); llassert(!mHasFetcher);
return false; // skip return false; // skip
} }
if (!mLoadedCallbackList.empty() && mRawImage.notNull()) if (!mLoadedCallbackList.empty() && mRawImage.notNull())
@@ -1942,8 +1942,8 @@ bool LLViewerFetchedTexture::updateFetch()
mHasFetcher = FALSE; mHasFetcher = FALSE;
} }
} }
llassert_always(mRawImage.notNull() || (!mNeedsCreateTexture && !mIsRawImageValid)); llassert(mRawImage.notNull() || (!mNeedsCreateTexture && !mIsRawImageValid));
return mIsFetching ? true : false; return mIsFetching ? true : false;
} }