summaryrefslogtreecommitdiff
path: root/indra/newview/llglsandbox.cpp
diff options
context:
space:
mode:
authorsimon <none@none>2014-05-07 10:56:41 -0700
committersimon <none@none>2014-05-07 10:56:41 -0700
commit250db74bf9325acdc1169f6c13d297e7fe44b753 (patch)
treec6926efeefeb10ec3a36b296aa1ac7bd8521e0e3 /indra/newview/llglsandbox.cpp
parent676bad148a72c235ec79742e3f490ca66b4f40d0 (diff)
parentd0ef02c23a7a37c8c9bfe3a86bae88bb811fc9fe (diff)
Pull and merge viewer-release as version 3.7.8
Diffstat (limited to 'indra/newview/llglsandbox.cpp')
-rwxr-xr-xindra/newview/llglsandbox.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llglsandbox.cpp b/indra/newview/llglsandbox.cpp
index cf550e5eff..c386030329 100755
--- a/indra/newview/llglsandbox.cpp
+++ b/indra/newview/llglsandbox.cpp
@@ -991,7 +991,7 @@ void gpu_benchmark()
F32 gbps = results[results.size()/2];
- llinfos << "Memory bandwidth is " << llformat("%.3f", gbps) << "GB/sec according to CPU timers" << llendl;
+ LL_INFOS() << "Memory bandwidth is " << llformat("%.3f", gbps) << "GB/sec according to CPU timers" << LL_ENDL;
F32 ms = gBenchmarkProgram.mTimeElapsed/1000000.f;
F32 seconds = ms/1000.f;
@@ -1002,11 +1002,11 @@ void gpu_benchmark()
if (gGLManager.mHasTimerQuery)
{
- llinfos << "Memory bandwidth is " << llformat("%.3f", gbps) << "GB/sec according to ARB_timer_query" << llendl;
+ LL_INFOS() << "Memory bandwidth is " << llformat("%.3f", gbps) << "GB/sec according to ARB_timer_query" << LL_ENDL;
}
else
{
- llinfos << "ARB_timer_query unavailable." << llendl;
+ LL_INFOS() << "ARB_timer_query unavailable." << LL_ENDL;
}
}