summaryrefslogtreecommitdiff
path: root/indra/newview/llvoavatarself.h
diff options
context:
space:
mode:
authorRichard Linden <none@none>2012-02-08 19:55:28 -0800
committerRichard Linden <none@none>2012-02-08 19:55:28 -0800
commitbbdb390624bd1289b330beed0f7bf30b3c94af8a (patch)
tree070d2b78c0902dcad2f0d6767ca0b21f93bdfef7 /indra/newview/llvoavatarself.h
parentdd2bf737e08b3457dcd982ece5e200499dacf7d8 (diff)
parent2ed1de224a45fafb12fea42e8dfb83f9728cdcf1 (diff)
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience/
Diffstat (limited to 'indra/newview/llvoavatarself.h')
-rw-r--r--indra/newview/llvoavatarself.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llvoavatarself.h b/indra/newview/llvoavatarself.h
index 74ff47a3e4..54dbe81993 100644
--- a/indra/newview/llvoavatarself.h
+++ b/indra/newview/llvoavatarself.h
@@ -41,6 +41,7 @@ struct LocalTextureData;
class LLVOAvatarSelf :
public LLVOAvatar
{
+ LOG_CLASS(LLVOAvatarSelf);
/********************************************************************************
** **
@@ -358,6 +359,8 @@ public:
void debugWearablesLoaded() { mDebugTimeWearablesLoaded = mDebugSelfLoadTimer.getElapsedTimeF32(); }
void debugAvatarVisible() { mDebugTimeAvatarVisible = mDebugSelfLoadTimer.getElapsedTimeF32(); }
void outputRezDiagnostics() const;
+ void outputRezTiming(const std::string& msg) const;
+ void reportAvatarRezTime() const;
void debugBakedTextureUpload(LLVOAvatarDefines::EBakedTextureIndex index, BOOL finished);
static void debugOnTimingLocalTexLoaded(BOOL success, LLViewerFetchedTexture *src_vi, LLImageRaw* src, LLImageRaw* aux_src, S32 discard_level, BOOL final, void* userdata);