diff options
| author | Richard Linden <none@none> | 2012-11-08 23:42:18 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2012-11-08 23:42:18 -0800 |
| commit | 0bb0bd514b235948c1a21c81ab0e8ab6223b1990 (patch) | |
| tree | e0d49acc9074d0a5ed30c9c53fde908e5305b10f /indra/newview/llappviewer.cpp | |
| parent | ed17c181dd37f56b808838748d289ee7bb5567ec (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/llappviewer.cpp')
| -rw-r--r-- | indra/newview/llappviewer.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 838a982cb4..ac659c409b 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -277,7 +277,7 @@ LLPumpIO* gServicePump = NULL; U64 gFrameTime = 0; F32 gFrameTimeSeconds = 0.f; -LLUnit::Seconds<F32> gFrameIntervalSeconds = 0.f; +LLUnit<LLUnits::Seconds, F32> gFrameIntervalSeconds = 0.f; F32 gFPSClamped = 10.f; // Pretend we start at target rate. F32 gFrameDTClamped = 0.f; // Time between adjacent checks to network for packets U64 gStartTime = 0; // gStartTime is "private", used only to calculate gFrameTimeSeconds |