diff options
| author | Richard Linden <none@none> | 2013-09-07 21:54:03 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-09-07 21:54:03 -0700 |
| commit | c6b6ae7a45f7ab473dd839515a1717bae68af03a (patch) | |
| tree | 74bc548852a9ea3cf350096b55182761362a3f6d /indra/llui/lluictrlfactory.h | |
| parent | 3fd68662f267a3fd96d101834b3a9563bde3f61e (diff) | |
| parent | e4cacda5a0cf3918bdc8091997b988235e9d4f3d (diff) | |
merge
Diffstat (limited to 'indra/llui/lluictrlfactory.h')
| -rwxr-xr-x | indra/llui/lluictrlfactory.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/indra/llui/lluictrlfactory.h b/indra/llui/lluictrlfactory.h index 87b3937417..678e837fa1 100755 --- a/indra/llui/lluictrlfactory.h +++ b/indra/llui/lluictrlfactory.h @@ -74,9 +74,9 @@ class LLWidgetNameRegistry //: public LLRegistrySingleton<const std::type_info*, empty_param_block_func_t, LLDefaultParamBlockRegistry> //{}; -extern LLFastTimer::DeclareTimer FTM_WIDGET_SETUP; -extern LLFastTimer::DeclareTimer FTM_WIDGET_CONSTRUCTION; -extern LLFastTimer::DeclareTimer FTM_INIT_FROM_PARAMS; +extern LLTrace::TimeBlock FTM_WIDGET_SETUP; +extern LLTrace::TimeBlock FTM_WIDGET_CONSTRUCTION; +extern LLTrace::TimeBlock FTM_INIT_FROM_PARAMS; // Build time optimization, generate this once in .cpp file #ifndef LLUICTRLFACTORY_CPP @@ -229,10 +229,10 @@ private: //return NULL; } - { LLFastTimer _(FTM_WIDGET_CONSTRUCTION); + { LL_RECORD_BLOCK_TIME(FTM_WIDGET_CONSTRUCTION); widget = new T(params); } - { LLFastTimer _(FTM_INIT_FROM_PARAMS); + { LL_RECORD_BLOCK_TIME(FTM_INIT_FROM_PARAMS); widget->initFromParams(params); } @@ -247,7 +247,7 @@ private: template<typename T> static T* defaultBuilder(LLXMLNodePtr node, LLView *parent, LLXMLNodePtr output_node) { - LLFastTimer timer(FTM_WIDGET_SETUP); + LL_RECORD_BLOCK_TIME(FTM_WIDGET_SETUP); typename T::Params params(getDefaultParams<T>()); |