From 1b9e6225c8e438d44beb6a993cf1d0f24659d1e0 Mon Sep 17 00:00:00 2001 From: "Brad Payne (Vir Linden)" Date: Fri, 28 Jul 2017 13:39:54 +0100 Subject: SL-763 - added some additional logging related to animation playback speed --- indra/llcharacter/llmotioncontroller.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'indra/llcharacter') diff --git a/indra/llcharacter/llmotioncontroller.h b/indra/llcharacter/llmotioncontroller.h index 72de331694..22357a2c6b 100644 --- a/indra/llcharacter/llmotioncontroller.h +++ b/indra/llcharacter/llmotioncontroller.h @@ -150,10 +150,13 @@ public: BOOL isPaused() const { return mPaused; } void setTimeStep(F32 step); + F32 getTimeStep() const { return mTimeStep; } void setTimeFactor(F32 time_factor); F32 getTimeFactor() const { return mTimeFactor; } + F32 getAnimTime() const { return mAnimTime; } + motion_list_t& getActiveMotions() { return mActiveMotions; } void incMotionCounts(S32& num_motions, S32& num_loading_motions, S32& num_loaded_motions, S32& num_active_motions, S32& num_deprecated_motions); -- cgit v1.2.3 From f196d8b18dc90d7204061ea6df5ea17eecfd9ccf Mon Sep 17 00:00:00 2001 From: "Brad Payne (Vir Linden)" Date: Fri, 4 Aug 2017 21:11:11 +0100 Subject: SL-731 - bug fix --- indra/llcharacter/llcharacter.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/llcharacter') diff --git a/indra/llcharacter/llcharacter.cpp b/indra/llcharacter/llcharacter.cpp index 4df975ecc5..3e58d9b3cd 100644 --- a/indra/llcharacter/llcharacter.cpp +++ b/indra/llcharacter/llcharacter.cpp @@ -501,7 +501,7 @@ void LLCharacter::updateVisualParams() } LLAnimPauseRequest LLCharacter::requestPause() -{ +{X mMotionController.pauseAllMotions(); return mPauseRequest; } -- cgit v1.2.3 From e27efe894740c0c3c959115524ac49db9615262a Mon Sep 17 00:00:00 2001 From: "Brad Payne (Vir Linden)" Date: Fri, 4 Aug 2017 21:13:10 +0100 Subject: SL-731 - more bug fix --- indra/llcharacter/llcharacter.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/llcharacter') diff --git a/indra/llcharacter/llcharacter.cpp b/indra/llcharacter/llcharacter.cpp index 3e58d9b3cd..4df975ecc5 100644 --- a/indra/llcharacter/llcharacter.cpp +++ b/indra/llcharacter/llcharacter.cpp @@ -501,7 +501,7 @@ void LLCharacter::updateVisualParams() } LLAnimPauseRequest LLCharacter::requestPause() -{X +{ mMotionController.pauseAllMotions(); return mPauseRequest; } -- cgit v1.2.3