summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerobjectlist.cpp
diff options
context:
space:
mode:
authorRichard Linden <none@none>2013-08-14 11:51:49 -0700
committerRichard Linden <none@none>2013-08-14 11:51:49 -0700
commit26581404e426b00cd0a07c38b5cb858d5d5faa28 (patch)
treef2a9a512fac56b7ce4f5f643617346e05c0a2992 /indra/newview/llviewerobjectlist.cpp
parent9faaa28f4445425e8c5b7b002faffbe0365b905d (diff)
BUILDFIX: added header for numeric_limits support on gcc
added convenience types for units F32Seconds, etc.
Diffstat (limited to 'indra/newview/llviewerobjectlist.cpp')
-rwxr-xr-xindra/newview/llviewerobjectlist.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llviewerobjectlist.cpp b/indra/newview/llviewerobjectlist.cpp
index e8f68527e9..a8183e76b4 100755
--- a/indra/newview/llviewerobjectlist.cpp
+++ b/indra/newview/llviewerobjectlist.cpp
@@ -999,9 +999,9 @@ void LLViewerObjectList::update(LLAgent &agent, LLWorld &world)
// Time _can_ go backwards, for example if the user changes the system clock.
// It doesn't cause any fatal problems (just some oddness with stats), so we shouldn't assert here.
// llassert(time > gFrameTime);
- LLUnit<F64, LLUnits::Seconds> time_diff = time - gFrameTime;
+ LLUnits::F64Seconds time_diff = time - gFrameTime;
gFrameTime = time;
- LLUnit<F64, LLUnits::Seconds> time_since_start = gFrameTime - gStartTime;
+ LLUnits::F64Seconds time_since_start = gFrameTime - gStartTime;
gFrameTimeSeconds = time_since_start;
gFrameIntervalSeconds = gFrameTimeSeconds - last_time;