diff options
| author | prep <prep@lindenlab.com> | 2013-03-11 15:17:13 -0400 |
|---|---|---|
| committer | prep <prep@lindenlab.com> | 2013-03-11 15:17:13 -0400 |
| commit | 8e3b190e919fde84a2189d974208f9d199d4bea6 (patch) | |
| tree | 7ab1db96d291260cbad356533607e1bce36ed0a7 /indra/llrender/llfontregistry.cpp | |
| parent | 2ea750ebcad8335aeb0ec77a483831b62d05f643 (diff) | |
| parent | e0c9174609e2457fab7fe6d7291c6ebbd030397c (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 b5bdba996f..f5ca8d5b04 100644 --- a/indra/llrender/llfontregistry.cpp +++ b/indra/llrender/llfontregistry.cpp @@ -223,7 +223,7 @@ std::string currentOsName() return "Windows"; #elif LL_DARWIN return "Mac"; -#elif LL_SDL +#elif LL_SDL || LL_MESA_HEADLESS return "Linux"; #else return ""; |