livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed timer bars not appearing in fast timer view 

fixed "bouncing" stat values when a value ended in zeroes
meow-7.2.2
Richard Linden 2013-10-29 16:23:53 -07:00
parent 41394354dd
commit 155ca2f926
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/llcommon/lltracerecording.cpp
View File

@ -171,7 +171,7 @@ F64Seconds Recording::getSum(const StatType<TimeBlockAccumulator::SelfTimeFacet>
update();
const TimeBlockAccumulator& accumulator = mBuffers->mStackTimers[stat.getIndex()];
const TimeBlockAccumulator* active_accumulator = mActiveBuffers ? &mActiveBuffers->mStackTimers[stat.getIndex()] : NULL;
return F64Seconds((F64)(accumulator.mSelfTimeCounter) + (F64)(active_accumulator ? active_accumulator->mSelfTimeCounter : 0) / (F64)LLTrace::BlockTimer::countsPerSecond());
return F64Seconds(((F64)(accumulator.mSelfTimeCounter) + (F64)(active_accumulator ? active_accumulator->mSelfTimeCounter : 0)) / (F64)LLTrace::BlockTimer::countsPerSecond());
}

11
indra/llui/llstatbar.cpp
View File

@ -327,6 +327,7 @@ void LLStatBar::draw()
? mNumHistoryFrames
: mNumShortHistoryFrames;
S32 num_rapid_changes = 0;
S32 decimal_digits = mDecimalDigits;
switch(mStatType)
{
@ -374,6 +375,10 @@ void LLStatBar::draw()
display_value = current;
// always display current value, don't rate limit
mLastDisplayValue = current;
if (is_approx_equal((F32)(S32)display_value, display_value))
{
decimal_digits = 0;
}
}
}
break;
@ -412,12 +417,6 @@ void LLStatBar::draw()
mCurMaxBar = LLSmoothInterpolation::lerp(mCurMaxBar, mMaxBar, 0.05f);
mCurMinBar = LLSmoothInterpolation::lerp(mCurMinBar, mMinBar, 0.05f);
S32 decimal_digits = mDecimalDigits;
if (is_approx_equal((F32)(S32)display_value, display_value))
{
decimal_digits = 0;
}
// rate limited updates
if (mLastDisplayValueTimer.getElapsedTimeF32() < MEAN_VALUE_UPDATE_TIME)
{