2 files changed, 6 insertions, 6 deletions
diff --git a/indra/llrender/llfontfreetype.cpp b/indra/llrender/llfontfreetype.cpp
index 9a5d11b23a..eee4ea988b 100644
--- a/indra/llrender/llfontfreetype.cpp
+++ b/indra/llrender/llfontfreetype.cpp
@@ -815,7 +815,7 @@ void LLFontFreetype::setSubImageLuminanceAlpha(U32 x, U32 y, U32 bitmap_num, U32
 }
 
 
-namespace nd
+namespace ll
 {
     namespace fonts
     {
@@ -840,7 +840,7 @@ namespace nd
 U8 const* LLFontManager::loadFont( std::string const &aFilename, long &a_Size)
 {
     a_Size = 0;
-    std::map< std::string, std::shared_ptr<nd::fonts::LoadedFont> >::iterator itr = m_LoadedFonts.find( aFilename );
+    std::map< std::string, std::shared_ptr<ll::fonts::LoadedFont> >::iterator itr = m_LoadedFonts.find( aFilename );
     if( itr != m_LoadedFonts.end() )
     {
         ++itr->second->mRefs;
@@ -858,7 +858,7 @@ U8 const* LLFontManager::loadFont( std::string const &aFilename, long &a_Size)
 
     a_Size = static_cast<long>(strContent.size());
 
-    auto pCache = std::make_shared<nd::fonts::LoadedFont>( aFilename,  strContent, a_Size );
+    auto pCache = std::make_shared<ll::fonts::LoadedFont>( aFilename,  strContent, a_Size );
     itr = m_LoadedFonts.insert( std::make_pair( aFilename, pCache ) ).first;
 
     return reinterpret_cast<U8 const*>(itr->second->mAddress.c_str());
@@ -867,4 +867,4 @@ U8 const* LLFontManager::loadFont( std::string const &aFilename, long &a_Size)
 void LLFontManager::unloadAllFonts()
 {
     m_LoadedFonts.clear();
-}
-\ No newline at end of file
+}
diff --git a/indra/llrender/llfontfreetype.h b/indra/llrender/llfontfreetype.h
index e7d5a277e0..7173da5238 100644
--- a/indra/llrender/llfontfreetype.h
+++ b/indra/llrender/llfontfreetype.h
@@ -43,7 +43,7 @@ typedef struct FT_FaceRec_* LLFT_Face;
 struct FT_StreamRec_;
 typedef struct FT_StreamRec_ LLFT_Stream;
 
-namespace nd
+namespace ll
 {
     namespace fonts
     {
@@ -64,7 +64,7 @@ private:
     ~LLFontManager();
 
     void unloadAllFonts();
-    std::map< std::string, std::shared_ptr<nd::fonts::LoadedFont> > m_LoadedFonts;
+    std::map< std::string, std::shared_ptr<ll::fonts::LoadedFont> > m_LoadedFonts;
 };
 
 struct LLFontGlyphInfo