diff options
| author | Richard Linden <none@none> | 2013-08-15 00:02:23 -0700 | 
|---|---|---|
| committer | Richard Linden <none@none> | 2013-08-15 00:02:23 -0700 | 
| commit | 9f7bfa1c3710856cd2b0a0a8a429d6c45b0fcd09 (patch) | |
| tree | abc27a8ff7406b2216a13ba3804b006e60f1f080 /indra/llcommon/llfasttimer.cpp | |
| parent | 01c1d40b3faa139e9aeacbea7acae3ab65ca9dcd (diff) | |
moved unit types out of LLUnits namespace, since they are prefixed
Diffstat (limited to 'indra/llcommon/llfasttimer.cpp')
| -rwxr-xr-x | indra/llcommon/llfasttimer.cpp | 10 | 
1 files changed, 5 insertions, 5 deletions
diff --git a/indra/llcommon/llfasttimer.cpp b/indra/llcommon/llfasttimer.cpp index a91e716f19..5f92c66f47 100755 --- a/indra/llcommon/llfasttimer.cpp +++ b/indra/llcommon/llfasttimer.cpp @@ -339,7 +339,7 @@ void TimeBlock::logStats()  		}  		call_count++; -		LLUnits::F64Seconds total_time(0); +		F64Seconds total_time(0);  		LLSD sd;  		{ @@ -382,11 +382,11 @@ void TimeBlock::dumpCurTimes()  		++it)  	{  		TimeBlock* timerp = (*it); -		LLUnits::F64Seconds total_time = last_frame_recording.getSum(*timerp); +		F64Seconds total_time = last_frame_recording.getSum(*timerp);  		U32 num_calls = last_frame_recording.getSum(timerp->callCount());  		// Don't bother with really brief times, keep output concise -		if (total_time < LLUnits::F32Milliseconds(0.1f)) continue; +		if (total_time < F32Milliseconds(0.1f)) continue;  		std::ostringstream out_str;  		TimeBlock* parent_timerp = timerp; @@ -466,11 +466,11 @@ void TimeBlockAccumulator::reset( const TimeBlockAccumulator* other )  	}  } -LLUnits::F64Seconds BlockTimer::getElapsedTime() +F64Seconds BlockTimer::getElapsedTime()  {  	U64 total_time = TimeBlock::getCPUClockCount64() - mStartTime; -	return LLUnits::F64Seconds((F64)total_time / (F64)TimeBlock::countsPerSecond()); +	return F64Seconds((F64)total_time / (F64)TimeBlock::countsPerSecond());  }  | 
