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/llwindow/llwindow.cpp | |
| parent | 7153d1db11c00245a379fa9601f092020152ea73 (diff) | |
| parent | 2c60cfdde3b6e3301942139ae5004bd4d480c955 (diff) | |
Merge sunshine-internal -> sunshine-experimental
Diffstat (limited to 'indra/llwindow/llwindow.cpp')
| -rw-r--r-- | indra/llwindow/llwindow.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/llwindow/llwindow.cpp b/indra/llwindow/llwindow.cpp index 5b7424acbb..d83278d875 100644 --- a/indra/llwindow/llwindow.cpp +++ b/indra/llwindow/llwindow.cpp @@ -256,6 +256,8 @@ std::vector<std::string> LLWindow::getDynamicFallbackFontList() return LLWindowWin32::getDynamicFallbackFontList(); #elif LL_DARWIN return LLWindowMacOSX::getDynamicFallbackFontList(); +#elif LL_MESA_HEADLESS + return std::vector<std::string>(); #elif LL_SDL return LLWindowSDL::getDynamicFallbackFontList(); #else |