diff options
author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2014-12-15 17:03:34 -0500 |
---|---|---|
committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2014-12-15 17:03:34 -0500 |
commit | cce5bb5dae98102f6fc1f95fe78c8e20260d3f2e (patch) | |
tree | fd24b70caccd724fb78e2c453d77ce5ca89ebe72 /indra | |
parent | a357a4096cb645956a2432adfd5dcadc55c153f5 (diff) |
SL-92 WIP - more debug line monitoring, changed AppearanceHover block to be optional.
Diffstat (limited to 'indra')
-rwxr-xr-x | indra/newview/llvoavatar.cpp | 15 | ||||
-rwxr-xr-x | indra/newview/llvoavatar.h | 1 |
2 files changed, 16 insertions, 0 deletions
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp index 118ed10eb2..765220cdd4 100755 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp @@ -776,6 +776,7 @@ LLVOAvatar::LLVOAvatar(const LLUUID& id, mRuthTimer.reset(); mRuthDebugTimer.reset(); mDebugExistenceTimer.reset(); + mLastAppearanceMessageTimer.reset(); mPelvisOffset = LLVector3(0.0f,0.0f,0.0f); mLastPelvisToFoot = 0.0f; mPelvisFixup = 0.0f; @@ -3223,6 +3224,13 @@ BOOL LLVOAvatar::updateCharacter(LLAgent &agent) { debug_line += llformat(" hov_z: %f", mHoverOffset[2]); } + F32 elapsed = mLastAppearanceMessageTimer.getElapsedTimeF32(); + static char *elapsed_chars = "Xx*..."; + U32 bucket = U32(elapsed*2); + if (bucket < strlen(elapsed_chars)) + { + debug_line += llformat(" %c", elapsed_chars[bucket]); + } addDebugText(debug_line); } if (gSavedSettings.getBOOL("DebugAvatarCompositeBaked")) @@ -7147,6 +7155,8 @@ void LLVOAvatar::processAvatarAppearance( LLMessageSystem* mesgsys ) return; } + mLastAppearanceMessageTimer.reset(); + ESex old_sex = getSex(); LLAppearanceMessageContents contents; @@ -7331,6 +7341,11 @@ void LLVOAvatar::processAvatarAppearance( LLMessageSystem* mesgsys ) } } + if (isSelf()) + { + LL_INFOS("Avatar") << "hover was set: " << contents.mHoverOffsetWasSet << " value_z " << contents.mHoverOffset[2] << LL_ENDL; + } + if (contents.mHoverOffsetWasSet && !isSelf()) { // Got an update for some other avatar. diff --git a/indra/newview/llvoavatar.h b/indra/newview/llvoavatar.h index 445f0ff921..8135c3d4d8 100755 --- a/indra/newview/llvoavatar.h +++ b/indra/newview/llvoavatar.h @@ -992,6 +992,7 @@ public: protected: LLFrameTimer mRuthDebugTimer; // For tracking how long it takes for av to rez LLFrameTimer mDebugExistenceTimer; // Debugging for how long the avatar has been in memory. + LLFrameTimer mLastAppearanceMessageTimer; // Time since last appearance message received. //-------------------------------------------------------------------- // COF monitoring |