svn merge -r114093:114412 svn+ssh://svn.lindenlab.com/svn/linden/branches/featurettes/featurettes-batch5-merge

Melinda (coco): 5th and final batch of featurettes. My work here is done.

1 files changed, 5 insertions, 5 deletions

diff --git a/indra/llwindow/llwindow.cpp b/indra/llwindow/llwindow.cpp
index bd7c4d8410..fb4770e847 100644
--- a/indra/llwindow/llwindow.cpp
+++ b/indra/llwindow/llwindow.cpp
@@ -309,16 +309,16 @@ void *LLWindow::getMediaWindow()
 }
 
 // static
-std::string LLWindow::getFontListSans()
+std::vector<std::string> LLWindow::getDynamicFallbackFontList()
 {
 #if LL_WINDOWS
-	return LLWindowWin32::getFontListSans();
+	return LLWindowWin32::getDynamicFallbackFontList();
 #elif LL_DARWIN
-	return LLWindowMacOSX::getFontListSans();
+	return LLWindowMacOSX::getDynamicFallbackFontList();
 #elif LL_SDL
-	return LLWindowSDL::getFontListSans();
+	return LLWindowSDL::getDynamicFallbackFontList();
 #else
-	return "";
+	return std::vector<std::string>();
 #endif
 }