summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerobjectlist.cpp
diff options
context:
space:
mode:
authorRichard Linden <none@none>2013-08-15 00:02:23 -0700
committerRichard Linden <none@none>2013-08-15 00:02:23 -0700
commit9f7bfa1c3710856cd2b0a0a8a429d6c45b0fcd09 (patch)
treeabc27a8ff7406b2216a13ba3804b006e60f1f080 /indra/newview/llviewerobjectlist.cpp
parent01c1d40b3faa139e9aeacbea7acae3ab65ca9dcd (diff)
moved unit types out of LLUnits namespace, since they are prefixed
Diffstat (limited to 'indra/newview/llviewerobjectlist.cpp')
-rwxr-xr-xindra/newview/llviewerobjectlist.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llviewerobjectlist.cpp b/indra/newview/llviewerobjectlist.cpp
index a8183e76b4..4643430c6b 100755
--- a/indra/newview/llviewerobjectlist.cpp
+++ b/indra/newview/llviewerobjectlist.cpp
@@ -995,13 +995,13 @@ void LLViewerObjectList::update(LLAgent &agent, LLWorld &world)
// update global timer
F32 last_time = gFrameTimeSeconds;
- LLUnit<U64, LLUnits::Microseconds> time = totalTime(); // this will become the new gFrameTime when the update is done
+ U64Microseconds time = totalTime(); // this will become the new gFrameTime when the update is done
// 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);
- LLUnits::F64Seconds time_diff = time - gFrameTime;
+ F64Seconds time_diff = time - gFrameTime;
gFrameTime = time;
- LLUnits::F64Seconds time_since_start = gFrameTime - gStartTime;
+ F64Seconds time_since_start = gFrameTime - gStartTime;
gFrameTimeSeconds = time_since_start;
gFrameIntervalSeconds = gFrameTimeSeconds - last_time;