From 1aa0416aef379bb3ad1012441588b6d7fab81b40 Mon Sep 17 00:00:00 2001
From: Christian Goetze <cg@lindenlab.com>
Date: Fri, 13 Mar 2009 21:28:40 +0000
Subject: 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.

---
 indra/llwindow/llwindow.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/llwindow/llwindow.h')

diff --git a/indra/llwindow/llwindow.h b/indra/llwindow/llwindow.h
index ae33c5a814..9e01596b81 100644
--- a/indra/llwindow/llwindow.h
+++ b/indra/llwindow/llwindow.h
@@ -198,7 +198,7 @@ public:
 	virtual void interruptLanguageTextInput() {}
 	virtual void spawnWebBrowser(const std::string& escaped_url) {};
 
-	static std::string getFontListSans();
+	static std::vector<std::string> getDynamicFallbackFontList();
 
 protected:
 	LLWindow(BOOL fullscreen, U32 flags);
-- 
cgit v1.2.3