summaryrefslogtreecommitdiff
path: root/indra/newview/llscenemonitor.cpp
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/newview/llscenemonitor.cpp
parent52086d4485e004999d097cb66fb5cf63e34203d2 (diff)
parent26581404e426b00cd0a07c38b5cb858d5d5faa28 (diff)
Automated merge with http://bitbucket.org/lindenlab/viewer-interesting
Diffstat (limited to 'indra/newview/llscenemonitor.cpp')
-rw-r--r--indra/newview/llscenemonitor.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llscenemonitor.cpp b/indra/newview/llscenemonitor.cpp
index f0c7a220a4..d16c2d3984 100644
--- a/indra/newview/llscenemonitor.cpp
+++ b/indra/newview/llscenemonitor.cpp
@@ -525,7 +525,7 @@ void LLSceneMonitor::dumpToFile(std::string file_name)
PeriodicRecording& scene_load_recording = mSceneLoadRecording.getResults();
const U32 frame_count = scene_load_recording.getNumRecordedPeriods();
- LLUnit<F64, LLUnits::Seconds> frame_time;
+ LLUnits::F64Seconds frame_time;
os << "Stat";
for (S32 frame = 1; frame <= frame_count; frame++)