diff options
| author | Vadim Savchuk <vsavchuk@productengine.com> | 2010-05-20 14:05:32 +0300 |
|---|---|---|
| committer | Vadim Savchuk <vsavchuk@productengine.com> | 2010-05-20 14:05:32 +0300 |
| commit | fe641682176a4940ad5d71366f0b74f9eabe7118 (patch) | |
| tree | 82f1a09547b4c92bfa405b51e4683595c0cc26bb /indra/newview/llvoavatar.h | |
| parent | 56e88c6b2e656a28b25154e27c05e7ced65d90a8 (diff) | |
| parent | 13d2501c847929ce9ee155dbb4dcfcf166710d3e (diff) | |
Manual merge from default branch.
Auto-resolved conflicts in:
- indra/newview/llpaneleditwearable.cpp
- indra/newview/llviewermenu.cpp
- indra/newview/llviewerwindow.cpp
- indra/newview/skins/default/xui/en/notifications.xml
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llvoavatar.h')
| -rw-r--r-- | indra/newview/llvoavatar.h | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/indra/newview/llvoavatar.h b/indra/newview/llvoavatar.h index d74b4fe7b2..86a7cdae02 100644 --- a/indra/newview/llvoavatar.h +++ b/indra/newview/llvoavatar.h @@ -260,8 +260,6 @@ private: S32 mFullyLoadedFrameCounter; LLFrameTimer mFullyLoadedTimer; LLFrameTimer mRuthTimer; - LLFrameTimer mRuthDebugTimer; // For tracking how long it takes for av to rez - LLFrameTimer mDebugExistenceTimer; // Debugging for how long the avatar has been in memory. /** State ** ** @@ -894,6 +892,9 @@ private: ** DIAGNOSTICS **/ + //-------------------------------------------------------------------- + // General + //-------------------------------------------------------------------- public: static void dumpArchetypeXML(void*); static void dumpBakedStatus(); @@ -913,6 +914,14 @@ private: F32 mAdjustedPixelArea; std::string mDebugText; + + //-------------------------------------------------------------------- + // Avatar Rez Metrics + //-------------------------------------------------------------------- +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. + /** Diagnostics ** ** *******************************************************************************/ |