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/llwindow/llwindow.cpp | |
| parent | 0bb1324a27d4dd94d6f8a9d445ab892127f48c5f (diff) | |
| parent | 95f3fb45ae2f4fe199e34f35be1e46b3a598ca1a (diff) | |
merge
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 |