3 files changed, 52 insertions, 9 deletions

diff --git a/linden/indra/llrender/llfontregistry.cpp b/linden/indra/llrender/llfontregistry.cpp
index 619228e..cbd0d5a 100644
--- a/linden/indra/llrender/llfontregistry.cpp
+++ b/linden/indra/llrender/llfontregistry.cpp
@@ -177,6 +177,9 @@ LLFontRegistry::LLFontRegistry(const string_vec_t& xui_paths)
         // This is potentially a slow directory traversal, so we want to
         // cache the result.
         mUltimateFallbackList = LLWindow::getDynamicFallbackFontList();
+
+        std::string font_choice = gSavedSettings.getString("FontChoice");
+        setAlias("SansSerif", font_choice);
 }
 
 LLFontRegistry::~LLFontRegistry()
@@ -511,6 +514,13 @@ LLFontGL *LLFontRegistry::getFont(const LLFontDescriptor& orig_desc)
 {
         LLFontDescriptor norm_desc = orig_desc.normalize();
 
+        if (hasAlias(norm_desc.getName()))
+        {
+                // llinfos << "Font " << norm_desc.getName() << " is alias for "
+                //         << expandAlias(norm_desc.getName()) << llendl;
+                norm_desc.setName(expandAlias(norm_desc.getName()));
+        }
+
         font_reg_map_t::iterator it = mFontMap.find(norm_desc);
         if (it != mFontMap.end())
                 return it->second;
@@ -649,3 +659,31 @@ void LLFontRegistry::dump()
                 }
         }
 }
+
+
+
+std::string LLFontRegistry::expandAlias(std::string alias_name)
+{
+        font_alias_map_t::iterator it = mFontAliases.find(alias_name);
+        if (it != mFontAliases.end())
+        {
+                return it->second;
+        }
+        return alias_name;
+}
+
+void LLFontRegistry::setAlias(std::string alias_name, std::string orig_name)
+{
+        mFontAliases[alias_name] = orig_name;
+}
+
+void LLFontRegistry::clearAlias(std::string alias_name)
+{
+        mFontAliases.erase(alias_name);
+}
+
+bool LLFontRegistry::hasAlias(std::string alias_name)
+{
+        font_alias_map_t::iterator it = mFontAliases.find(alias_name);
+        return (it != mFontAliases.end());
+}
diff --git a/linden/indra/llrender/llfontregistry.h b/linden/indra/llrender/llfontregistry.h
index 523e184..0add372 100644
--- a/linden/indra/llrender/llfontregistry.h
+++ b/linden/indra/llrender/llfontregistry.h
@@ -97,15 +97,29 @@ public:
         
         const string_vec_t& getUltimateFallbackList() const { return mUltimateFallbackList; }
 
+        // If alias_name is a defined alias, returns the original name.
+        // Otherwise returns alias_name itself.
+        std::string expandAlias(std::string alias_name);
+        // Define alias_name as an alias of orig_name.
+        void setAlias(std::string alias_name, std::string orig_name);
+        // Undefines the alias alias_name. Does nothing if it's not an alias.
+        void clearAlias(std::string alias_name);
+        // True if the alias is defined.
+        bool hasAlias(std::string alias_name);
+
+
 private:
         LLFontGL *createFont(const LLFontDescriptor& desc);
         typedef std::map<LLFontDescriptor,LLFontGL*> font_reg_map_t;
         typedef std::map<std::string,F32> font_size_map_t;
+        typedef std::map<std::string,std::string> font_alias_map_t;
 
         // Given a descriptor, look up specific font instantiation.
         font_reg_map_t mFontMap;
         // Given a size name, look up the point size.
         font_size_map_t mFontSizes;
+        // Given an alias name, look up the original name.
+        font_alias_map_t mFontAliases;
 
         string_vec_t mUltimateFallbackList;
         string_vec_t mXUIPaths;
diff --git a/linden/indra/newview/skins/default/xui/en-us/fonts.xml b/linden/indra/newview/skins/default/xui/en-us/fonts.xml
index 5d831c6..df1356b 100644
--- a/linden/indra/newview/skins/default/xui/en-us/fonts.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/fonts.xml
@@ -18,15 +18,6 @@
     </os>
   </font>
 
-  <font name="SansSerif" comment="Name of san-serif font (Truetype file name)">
-    <file>DejaVuSansCondensed.ttf</file>
-  </font>
-
-  <font name="SansSerifBold" 
-        comment="Name of bold sans-serif font" 
-        font_style="Bold">
-    <file>DejaVuSansCondensed-Bold.ttf</file>
-  </font>
 
   <font name="Monospace"
         comment="Name of monospace font">