livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SL-731 - bug fix

master
Brad Payne (Vir Linden) 2017-08-04 21:11:11 +01:00
parent 72010fba4d
commit f196d8b18d
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/llcharacter/llcharacter.cpp
View File

@ -501,7 +501,7 @@ void LLCharacter::updateVisualParams()
}
LLAnimPauseRequest LLCharacter::requestPause()
{
{X
mMotionController.pauseAllMotions();
return mPauseRequest;
}

5
indra/newview/llvovolume.cpp
View File

@ -1309,7 +1309,10 @@ BOOL LLVOVolume::calcLOD()
{
LLViewerObject* childp = *iter;
LLVOVolume *child_volp = dynamic_cast<LLVOVolume*>(childp);
total_tris += child_volp->getTriangleCount();
if (child_volp)
{
total_tris += child_volp->getTriangleCount();
}
}
setDebugText(llformat("TRIS %d TOTAL %d", getTriangleCount(), total_tris));
}