summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerassetstats.cpp
diff options
context:
space:
mode:
authorRichard Linden <none@none>2012-11-08 23:42:18 -0800
committerRichard Linden <none@none>2012-11-08 23:42:18 -0800
commit0bb0bd514b235948c1a21c81ab0e8ab6223b1990 (patch)
treee0d49acc9074d0a5ed30c9c53fde908e5305b10f /indra/newview/llviewerassetstats.cpp
parented17c181dd37f56b808838748d289ee7bb5567ec (diff)
SH-3499 WIP Ensure asset stats output is correct
Finished making LLUnit implicitly convertible to/from scalar integer values cleaned up test code
Diffstat (limited to 'indra/newview/llviewerassetstats.cpp')
-rwxr-xr-xindra/newview/llviewerassetstats.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llviewerassetstats.cpp b/indra/newview/llviewerassetstats.cpp
index bad2f5b4cd..73a2e24424 100755
--- a/indra/newview/llviewerassetstats.cpp
+++ b/indra/newview/llviewerassetstats.cpp
@@ -430,10 +430,10 @@ void LLViewerAssetStats::getStats(AssetStats& stats, bool compact_output)
grid_from_region_handle(it->first, &grid_x, &grid_y);
r.grid_x(grid_x);
r.grid_y(grid_y);
- r.duration(LLUnit::Microseconds<F64>(rec.getDuration()).value());
+ r.duration(LLUnit<LLUnits::Microseconds, F64>(rec.getDuration()).value());
}
- stats.duration(mCurRecording ? LLUnit::Microseconds<F64>(mCurRecording->getDuration()).value() : 0.0);
+ stats.duration(mCurRecording ? LLUnit<LLUnits::Microseconds, F64>(mCurRecording->getDuration()).value() : 0.0);
stats.avatar.setProvided(true);
for (S32 rez_stat=0; rez_stat < mAvatarRezStates.size(); ++rez_stat)