summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2017-07-28 13:39:54 +0100
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2017-07-28 13:39:54 +0100
commit1b9e6225c8e438d44beb6a993cf1d0f24659d1e0 (patch)
tree84da8d0dd26f88a683f58c71786b8b756ac44a8e /indra
parent22c8efc2ce8cac2056b73c504b95a9413fff8818 (diff)
SL-763 - added some additional logging related to animation playback speed
Diffstat (limited to 'indra')
-rw-r--r--indra/llcharacter/llmotioncontroller.h3
-rw-r--r--indra/newview/llcontrolavatar.cpp4
2 files changed, 7 insertions, 0 deletions
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);
diff --git a/indra/newview/llcontrolavatar.cpp b/indra/newview/llcontrolavatar.cpp
index 8dfc2e81dc..9ed3020b66 100644
--- a/indra/newview/llcontrolavatar.cpp
+++ b/indra/newview/llcontrolavatar.cpp
@@ -248,6 +248,10 @@ void LLControlAvatar::updateDebugText()
}
#endif
+ addDebugText(llformat("anim time %.1f (step %f factor %f)",
+ mMotionController.getAnimTime(),
+ mMotionController.getTimeStep(),
+ mMotionController.getTimeFactor()));
}
LLVOAvatar::updateDebugText();