diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2012-09-26 18:25:26 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2012-09-26 18:25:26 -0400 |
| commit | a43d242d00ef06934f9473444297fffe50760f93 (patch) | |
| tree | 6f557d2a183f626d7b53c4ecf0f9678439c90ce7 /indra/llrender/llfontregistry.cpp | |
| parent | 0bb1324a27d4dd94d6f8a9d445ab892127f48c5f (diff) | |
| parent | 95f3fb45ae2f4fe199e34f35be1e46b3a598ca1a (diff) | |
merge
Diffstat (limited to 'indra/llrender/llfontregistry.cpp')
| -rw-r--r-- | indra/llrender/llfontregistry.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llrender/llfontregistry.cpp b/indra/llrender/llfontregistry.cpp index 4d22eba3d9..d0637f2546 100644 --- a/indra/llrender/llfontregistry.cpp +++ b/indra/llrender/llfontregistry.cpp @@ -225,7 +225,7 @@ std::string currentOsName() return "Windows"; #elif LL_DARWIN return "Mac"; -#elif LL_SDL +#elif LL_SDL || LL_MESA_HEADLESS return "Linux"; #else return ""; |