diff options
| author | Richard Linden <none@none> | 2013-09-05 14:21:57 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-09-05 14:21:57 -0700 |
| commit | 9dc6478544711b1f03c9f7010421f9c8ebbbe008 (patch) | |
| tree | 1d28248570ac6e48596c787734bc39a891d9752e /indra/newview/llvotree.cpp | |
| parent | 736efc7b574635d5c86a97a33b456dd79a035777 (diff) | |
| parent | cbe397ad13665c7bc993e10d8fe1e4a876253378 (diff) | |
Automated merge with http://bitbucket.org/lindenlab/viewer-interesting
Diffstat (limited to 'indra/newview/llvotree.cpp')
| -rwxr-xr-x | indra/newview/llvotree.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llvotree.cpp b/indra/newview/llvotree.cpp index f5206b74ea..dad8ba09fe 100755 --- a/indra/newview/llvotree.cpp +++ b/indra/newview/llvotree.cpp @@ -479,11 +479,11 @@ LLDrawable* LLVOTree::createDrawable(LLPipeline *pipeline) const S32 LEAF_INDICES = 24; const S32 LEAF_VERTICES = 16; -static LLFastTimer::DeclareTimer FTM_UPDATE_TREE("Update Tree"); +static LLTrace::TimeBlock FTM_UPDATE_TREE("Update Tree"); BOOL LLVOTree::updateGeometry(LLDrawable *drawable) { - LLFastTimer ftm(FTM_UPDATE_TREE); + LL_RECORD_BLOCK_TIME(FTM_UPDATE_TREE); if(mTrunkLOD >= sMAX_NUM_TREE_LOD_LEVELS) //do not display the tree. { |