diff options
author | Oz Linden <oz@lindenlab.com> | 2017-10-11 09:13:55 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2017-10-11 09:13:55 -0400 |
commit | d62ad1ef8afc1b9abadbc611d373a7a7d9afc368 (patch) | |
tree | 9f14b141e692c3b78eee846f12fc021feacf1de6 /indra/llrender | |
parent | c0ac11e24022eb51918e825414f2c04f3085bc61 (diff) | |
parent | b6d22de58850fc9a5b34eeb5b7930e5845bfc42d (diff) |
merge changes for 5.0.8-release
Diffstat (limited to 'indra/llrender')
-rw-r--r-- | indra/llrender/llgl.cpp | 2 | ||||
-rw-r--r-- | indra/llrender/llgl.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/indra/llrender/llgl.cpp b/indra/llrender/llgl.cpp index 7757198af5..1847c661d7 100644 --- a/indra/llrender/llgl.cpp +++ b/indra/llrender/llgl.cpp @@ -65,7 +65,7 @@ static const std::string HEADLESS_VENDOR_STRING("Linden Lab"); static const std::string HEADLESS_RENDERER_STRING("Headless"); static const std::string HEADLESS_VERSION_STRING("1.0"); -std::ofstream gFailLog; +llofstream gFailLog; #if GL_ARB_debug_output diff --git a/indra/llrender/llgl.h b/indra/llrender/llgl.h index 75e5fe86ec..aa98b3f6bc 100644 --- a/indra/llrender/llgl.h +++ b/indra/llrender/llgl.h @@ -47,7 +47,7 @@ extern BOOL gDebugGL; extern BOOL gDebugSession; -extern std::ofstream gFailLog; +extern llofstream gFailLog; #define LL_GL_ERRS LL_ERRS("RenderState") |