diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2007-03-03 19:02:17 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2007-03-03 19:02:17 +0000 |
| commit | 7e99d870f2e7e5de48a59c7442b12b2f24ecb211 (patch) | |
| tree | 35da1d4b694bb5cc6f95c8e55df852e2329685bb /indra | |
| parent | 4dabd9c0472deb49573fdafef2fa413e59703f19 (diff) | |
Commented out temp fast timers that got checked in.
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llfasttimerview.cpp | 6 | ||||
| -rw-r--r-- | indra/newview/llvoavatar.cpp | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/llfasttimerview.cpp b/indra/newview/llfasttimerview.cpp index 09610b01a3..77e96fa73b 100644 --- a/indra/newview/llfasttimerview.cpp +++ b/indra/newview/llfasttimerview.cpp @@ -68,7 +68,7 @@ static struct ft_display_info ft_display_table[] = { LLFastTimer::FTM_WORLD_UPDATE, " World Update", &LLColor4::blue1, 1 }, { LLFastTimer::FTM_UPDATE_MOVE, " Move Objects", &LLColor4::pink2, 0 }, { LLFastTimer::FTM_OCTREE_BALANCE, " Octree Balance", &LLColor4::red3, 0 }, - { LLFastTimer::FTM_TEMP1, " Blur", &LLColor4::red1, 0 }, +// { LLFastTimer::FTM_TEMP1, " Blur", &LLColor4::red1, 0 }, { LLFastTimer::FTM_CULL, " Object Cull", &LLColor4::blue2, 1 }, { LLFastTimer::FTM_CULL_REBOUND, " Rebound", &LLColor4::blue3, 0 }, { LLFastTimer::FTM_FRUSTUM_CULL, " Frustum Cull", &LLColor4::blue4, 0 }, @@ -101,7 +101,7 @@ static struct ft_display_info ft_display_table[] = { LLFastTimer::FTM_UPDATE_ANIMATION, " Animation", &LLColor4::purple5, 0 }, { LLFastTimer::FTM_FLEXIBLE_UPDATE, " Flex Update", &LLColor4::pink2, 0 }, { LLFastTimer::FTM_LOD_UPDATE, " LOD Update", &LLColor4::magenta1, 0 }, - { LLFastTimer::FTM_TEMP5, " Check", &LLColor4::red1, 1}, +// { LLFastTimer::FTM_TEMP5, " Check", &LLColor4::red1, 1}, { LLFastTimer::FTM_REGION_UPDATE, " Region Update", &LLColor4::cyan2, 0 }, { LLFastTimer::FTM_NETWORK, " Network", &LLColor4::orange1, 1 }, { LLFastTimer::FTM_IDLE_NETWORK, " Decode Msgs", &LLColor4::orange2, 0 }, @@ -158,7 +158,7 @@ static struct ft_display_info ft_display_table[] = // { LLFastTimer::FTM_RENDER_FONTS, " Fonts", &LLColor4::pink1, 0 }, // { LLFastTimer::FTM_UPDATE_TEXTURES, " Textures", &LLColor4::pink2, 0 }, { LLFastTimer::FTM_SWAP, " Swap", &LLColor4::pink1, 0 }, - { LLFastTimer::FTM_TEMP6, " Client Copy", &LLColor4::red1, 1}, +// { LLFastTimer::FTM_TEMP6, " Client Copy", &LLColor4::red1, 1}, // { LLFastTimer::FTM_TEMP1, " Temp1", &LLColor4::red1, 0 }, // { LLFastTimer::FTM_TEMP2, " Temp2", &LLColor4::magenta1, 0 }, diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp index 2c920ecde8..507a1468c7 100644 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp @@ -3956,7 +3956,7 @@ void LLVOAvatar::renderCollisionVolumes() //------------------------------------------------------------------------ void LLVOAvatar::updateTextures(LLAgent &agent) { - LLFastTimer ftm(LLFastTimer::FTM_TEMP5); +// LLFastTimer ftm(LLFastTimer::FTM_TEMP5); BOOL render_avatar = TRUE; if (mIsDummy || gNoRender) |