summaryrefslogtreecommitdiff
path: root/indra/llcommon/llfasttimer.h
diff options
context:
space:
mode:
authorRichard Linden <none@none>2013-08-14 16:10:17 -0700
committerRichard Linden <none@none>2013-08-14 16:10:17 -0700
commitbceb1e8abe916cd69e7ac6ab70dc03dc6d76c9df (patch)
tree0016163049097d6b55a065b8fafdc609f1879c54 /indra/llcommon/llfasttimer.h
parent52086d4485e004999d097cb66fb5cf63e34203d2 (diff)
parent26581404e426b00cd0a07c38b5cb858d5d5faa28 (diff)
Automated merge with http://bitbucket.org/lindenlab/viewer-interesting
Diffstat (limited to 'indra/llcommon/llfasttimer.h')
-rwxr-xr-xindra/llcommon/llfasttimer.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llcommon/llfasttimer.h b/indra/llcommon/llfasttimer.h
index 73c40749ed..589b9bb941 100755
--- a/indra/llcommon/llfasttimer.h
+++ b/indra/llcommon/llfasttimer.h
@@ -48,7 +48,7 @@ public:
BlockTimer(TimeBlock& timer);
~BlockTimer();
- LLUnit<F64, LLUnits::Seconds> getElapsedTime();
+ LLUnits::F64Seconds getElapsedTime();
private: