diff options
| author | Richard Linden <none@none> | 2014-02-19 12:32:08 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2014-02-19 12:32:08 -0800 |
| commit | ef591d280eb3c5bae7da20540ad4cbb30858d0aa (patch) | |
| tree | ff387e884e25eaa8a47adff4110ce02edfe67387 /indra/llwindow/llwindowmesaheadless.cpp | |
| parent | ce7e19d33a74e89059c2196da9c439d0eb9b21c1 (diff) | |
| parent | 6661628d5c68855ddffc54a3f2578f93ada84de1 (diff) | |
Merge with release
Diffstat (limited to 'indra/llwindow/llwindowmesaheadless.cpp')
| -rwxr-xr-x | indra/llwindow/llwindowmesaheadless.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llwindow/llwindowmesaheadless.cpp b/indra/llwindow/llwindowmesaheadless.cpp index 11c22ac94e..4b01f7a979 100755 --- a/indra/llwindow/llwindowmesaheadless.cpp +++ b/indra/llwindow/llwindowmesaheadless.cpp @@ -46,7 +46,7 @@ LLWindowMesaHeadless::LLWindowMesaHeadless(LLWindowCallbacks* callbacks, { if (use_gl) { - llinfos << "MESA Init" << llendl; + LL_INFOS() << "MESA Init" << LL_ENDL; mMesaContext = OSMesaCreateContextExt( GL_RGBA, 32, 0, 0, NULL ); /* Allocate the image buffer */ @@ -58,7 +58,7 @@ LLWindowMesaHeadless::LLWindowMesaHeadless(LLWindowCallbacks* callbacks, /* Bind the buffer to the context and make it current */ if (!OSMesaMakeCurrent( mMesaContext, mMesaBuffer, MESA_CHANNEL_TYPE, width, height )) { - llerrs << "MESA: OSMesaMakeCurrent failed!" << llendl; + LL_ERRS() << "MESA: OSMesaMakeCurrent failed!" << LL_ENDL; } llverify(gGLManager.initGL()); |