diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-04-20 06:56:33 -0700 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-04-20 06:56:33 -0700 |
| commit | d3ec35fc6c2b8b47336650fe0570995201854a78 (patch) | |
| tree | f2113a1fa374fab76509f4462b2253b315584f65 /indra/newview/llvoavatarself.h | |
| parent | 4c3377a45abe3c8b2a0e376c62045a8f1260da08 (diff) | |
| parent | 19e0cc93a8af661dbac47552474a704ade600c74 (diff) | |
merge changes for latest viewer-development
Diffstat (limited to 'indra/newview/llvoavatarself.h')
| -rw-r--r-- | indra/newview/llvoavatarself.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/llvoavatarself.h b/indra/newview/llvoavatarself.h index 74ff47a3e4..655fb3a012 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); @@ -380,7 +383,7 @@ private: }; -extern LLVOAvatarSelf *gAgentAvatarp; +extern LLPointer<LLVOAvatarSelf> gAgentAvatarp; BOOL isAgentAvatarValid(); |