diff options
author | Richard Linden <none@none> | 2014-04-07 19:09:40 -0700 |
---|---|---|
committer | Richard Linden <none@none> | 2014-04-07 19:09:40 -0700 |
commit | 98aabdc176c23de9ba23f902dc2015f9c775d26e (patch) | |
tree | 5ac6ffdb8e9be8d3c2a2f8b591c9971726c6b73c /indra/llwindow/llwindowmesaheadless.cpp | |
parent | 7e966f28da79d2d24f93a2615c8807421300700c (diff) | |
parent | e5bbdafdeda0f2e6bbe97d59a24ca398b54c31eb (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()); |