From 8f7ec64899c54dcee6caa0307510cc4003ba7bdd Mon Sep 17 00:00:00 2001
From: James Cook <james@lindenlab.com>
Date: Mon, 27 Jul 2009 17:56:26 +0000
Subject: Merged skinning-17 into viewer-2 for bug fixes.  Commented out new IM
 window for now, not complete. Merging revisions 127913-128319 of
 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-17 into
 D:\viewer-2.0.0-3, respecting ancestry

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

(limited to 'indra/llrender/llfontregistry.h')

diff --git a/indra/llrender/llfontregistry.h b/indra/llrender/llfontregistry.h
index 198ca0b920..4da4ca48bb 100644
--- a/indra/llrender/llfontregistry.h
+++ b/indra/llrender/llfontregistry.h
@@ -98,7 +98,7 @@ public:
 
 	void dump();
 	
-	const string_vec_t& getUltimateFallbackList() const { return mUltimateFallbackList; }
+	const string_vec_t& getUltimateFallbackList() const;
 
 private:
 	LLFontGL *createFont(const LLFontDescriptor& desc);
-- 
cgit v1.2.3