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

Merge remote-tracking branch 'shyotl/future' into AltCompilers

Browse Source 
Conflicts:
	indra/llrender/llrendertarget.cpp
	indra/newview/llvovolume.cpp
This commit is contained in:
Drake Arconis
2012-08-08 18:54:04 -04:00
parent 457177905d d2b13f515d
commit e767392b44
82 changed files with 2312 additions and 1578 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
indra/llcharacter/llcharacter.cpp
View File

@@ -193,19 +193,14 @@ void LLCharacter::requestStopMotion( LLMotion* motion)
//-----------------------------------------------------------------------------
// updateMotions()
//-----------------------------------------------------------------------------
static LLFastTimer::DeclareTimer FTM_UPDATE_ANIMATION("Update Animation");
static LLFastTimer::DeclareTimer FTM_UPDATE_HIDDEN_ANIMATION("Update Hidden Anim");
void LLCharacter::updateMotions(e_update_t update_type)
{
if (update_type == HIDDEN_UPDATE)
{
LLFastTimer t(FTM_UPDATE_HIDDEN_ANIMATION);
mMotionController.updateMotionsMinimal();
}
else
{
LLFastTimer t(FTM_UPDATE_ANIMATION);
// unpause if the number of outstanding pause requests has dropped to the initial one
if (mMotionController.isPaused() && mPauseRequest->getNumRefs() == 1)
{