diff options
| author | Don Kjer <don@lindenlab.com> | 2012-09-20 04:42:46 +0000 |
|---|---|---|
| committer | Don Kjer <don@lindenlab.com> | 2012-09-20 04:42:46 +0000 |
| commit | f4ae8f1c4db6caabef629a7c9bb2d31344c61874 (patch) | |
| tree | ff64f474f57acbcf8fb67692bf4f8a70bc0ae526 /indra/llrender/llfontregistry.cpp | |
| parent | 7153d1db11c00245a379fa9601f092020152ea73 (diff) | |
| parent | 2c60cfdde3b6e3301942139ae5004bd4d480c955 (diff) | |
Merge sunshine-internal -> sunshine-experimental
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 ""; |