From a4000c3744e42fcbb638e742f3b63fa31a0dee15 Mon Sep 17 00:00:00 2001 From: Steven Bennetts Date: Fri, 8 May 2009 07:43:08 +0000 Subject: merge trunk@116587 skinning-7@119389 -> viewer-2.0.0-skinning-7 --- indra/newview/llfasttimerview.cpp | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) (limited to 'indra/newview/llfasttimerview.cpp') diff --git a/indra/newview/llfasttimerview.cpp b/indra/newview/llfasttimerview.cpp index c9037d0fbb..7a79b7ef3e 100644 --- a/indra/newview/llfasttimerview.cpp +++ b/indra/newview/llfasttimerview.cpp @@ -196,16 +196,18 @@ static struct ft_display_info ft_display_table[] = { LLFastTimer::FTM_RENDER_FONTS, " Fonts", &LLColor4::pink1, 0 }, { LLFastTimer::FTM_SWAP, " Swap", &LLColor4::pink2, 0 }, { LLFastTimer::FTM_CLIENT_COPY, " Client Copy", &LLColor4::red1, 1}, + { LLFastTimer::FTM_SWAP, " Swap", &LLColor4::pink2, 0 }, + { LLFastTimer::FTM_CLIENT_COPY, " Client Copy", &LLColor4::red1, 1}, #if 0 || !LL_RELEASE_FOR_DOWNLOAD - { LLFastTimer::FTM_TEMP1, " Temp1", &LLColor4::red1, 0 }, - { LLFastTimer::FTM_TEMP2, " Temp2", &LLColor4::magenta1, 0 }, - { LLFastTimer::FTM_TEMP3, " Temp3", &LLColor4::red2, 0 }, - { LLFastTimer::FTM_TEMP4, " Temp4", &LLColor4::magenta2, 0 }, - { LLFastTimer::FTM_TEMP5, " Temp5", &LLColor4::red3, 0 }, - { LLFastTimer::FTM_TEMP6, " Temp6", &LLColor4::magenta3, 0 }, - { LLFastTimer::FTM_TEMP7, " Temp7", &LLColor4::red4, 0 }, - { LLFastTimer::FTM_TEMP8, " Temp8", &LLColor4::magenta4, 0 }, + { LLFastTimer::FTM_TEMP1, " Temp1", &LLColor4::red1, 0 }, + { LLFastTimer::FTM_TEMP2, " Temp2", &LLColor4::magenta1, 0 }, + { LLFastTimer::FTM_TEMP3, " Temp3", &LLColor4::red2, 0 }, + { LLFastTimer::FTM_TEMP4, " Temp4", &LLColor4::magenta2, 0 }, + { LLFastTimer::FTM_TEMP5, " Temp5", &LLColor4::red3, 0 }, + { LLFastTimer::FTM_TEMP6, " Temp6", &LLColor4::magenta3, 0 }, + { LLFastTimer::FTM_TEMP7, " Temp7", &LLColor4::red4, 0 }, + { LLFastTimer::FTM_TEMP8, " Temp8", &LLColor4::magenta4, 0 }, #endif { LLFastTimer::FTM_OTHER, " Other", &red0 } @@ -215,9 +217,10 @@ static const int FTV_DISPLAY_NUM = LL_ARRAY_SIZE(ft_display_table); S32 ft_display_idx[FTV_DISPLAY_NUM]; // line of table entry for display purposes (for collapse) -LLFastTimerView::LLFastTimerView(const std::string& name, const LLRect& rect) - : LLFloater(name, rect, std::string("Fast Timers")) +LLFastTimerView::LLFastTimerView(const LLRect& rect) +: LLFloater() { + setRect(rect); setVisible(FALSE); mDisplayMode = 0; mAvgCountTotal = 0; -- cgit v1.2.3 From 27cf39cdbf27fe52dcf9c70cfdadcc18ddf2e75c Mon Sep 17 00:00:00 2001 From: Palmer Date: Thu, 6 Aug 2009 14:29:59 -0700 Subject: DEV-36732 Total time of frame saved Reviewed by Brad --- indra/newview/llfasttimerview.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'indra/newview/llfasttimerview.cpp') diff --git a/indra/newview/llfasttimerview.cpp b/indra/newview/llfasttimerview.cpp index b373dd2241..bae3d57300 100644 --- a/indra/newview/llfasttimerview.cpp +++ b/indra/newview/llfasttimerview.cpp @@ -982,8 +982,12 @@ LLSD LLFastTimerView::analyzePerformanceLogDefault(std::istream& is) std::string label = iter->first; F64 time = iter->second["Time"].asReal(); - - total_time += time; + + // Skip the total figure + if(label.compare("Total") != 0) + { + total_time += time; + } if (time > 0.0) { -- cgit v1.2.3