SL-92 WIP - more debug line monitoring, changed AppearanceHover block to be optional.

meow-7.2.2
Brad Payne (Vir Linden) 2014-12-15 17:03:34 -05:00
parent a357a4096c
commit cce5bb5dae
4 changed files with 18 additions and 2 deletions

View File

@ -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.

View File

@ -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

View File

@ -3595,7 +3595,7 @@ version 2.0
{ Flags U32 }
}
{
AppearanceHover Single
AppearanceHover Variable
{ HoverHeight LLVector3 }
}
}

View File

@ -1 +1 @@
bc6a4d7f7fd9bfddefcef336c3e30b623497447f
2286adc795b1b06eb86fdda431a71a6f0874b4f1