diff options
author | Ptolemy <ptolemy@lindenlab.com> | 2021-10-29 15:11:42 -0700 |
---|---|---|
committer | Ptolemy <ptolemy@lindenlab.com> | 2021-10-29 15:11:42 -0700 |
commit | 1be8a8d10bd3542b0b5c2943a508509c5cfcf3ef (patch) | |
tree | a4bd2bdddb24ae0b443878b0337e77787d3fea40 /indra/newview/llvograss.cpp | |
parent | 61bca72d37f695ee15897ddc3b9215c969ecf648 (diff) | |
parent | 68b75be652575ff301172b7b19522d4f0494bdf0 (diff) |
Fix merge conflict
Diffstat (limited to 'indra/newview/llvograss.cpp')
-rw-r--r-- | indra/newview/llvograss.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/indra/newview/llvograss.cpp b/indra/newview/llvograss.cpp index 345e87eea8..9a41eedb54 100644 --- a/indra/newview/llvograss.cpp +++ b/indra/newview/llvograss.cpp @@ -661,11 +661,9 @@ void LLGrassPartition::addGeometryCount(LLSpatialGroup* group, U32& vertex_count } } -static LLTrace::BlockTimerStatHandle FTM_REBUILD_GRASS_VB("Grass VB"); - void LLGrassPartition::getGeometry(LLSpatialGroup* group) { - LL_RECORD_BLOCK_TIME(FTM_REBUILD_GRASS_VB); + LL_PROFILE_ZONE_SCOPED; std::sort(mFaceList.begin(), mFaceList.end(), LLFace::CompareDistanceGreater()); |