Merge pull request #1745 from secondlife/project/gltf_development

move project/gltf development to develop

1 files changed, 3 insertions, 3 deletions

diff --git a/indra/llrender/llfontregistry.cpp b/indra/llrender/llfontregistry.cpp
index 546211aac8..62f4f35e3d 100644
--- a/indra/llrender/llfontregistry.cpp
+++ b/indra/llrender/llfontregistry.cpp
@@ -297,7 +297,7 @@ bool font_desc_init_from_xml(LLXMLNodePtr node, LLFontDescriptor& desc)
 
             if (child->hasAttribute("load_collection"))
             {
-                BOOL col = FALSE;
+                bool col = false;
                 child->getAttributeBOOL("load_collection", col);
                 if (col)
                 {
@@ -475,7 +475,7 @@ LLFontGL *LLFontRegistry::createFont(const LLFontDescriptor& desc)
 
     // The first font will get pulled will be the "head" font, set to non-fallback.
     // Rest will consitute the fallback list.
-    BOOL is_first_found = TRUE;
+    bool is_first_found = true;
 
     string_vec_t font_search_paths;
     font_search_paths.push_back(LLFontGL::getFontPathLocal());
@@ -499,7 +499,7 @@ LLFontGL *LLFontRegistry::createFont(const LLFontDescriptor& desc)
 
         // *HACK: Fallback fonts don't render, so we can use that to suppress
         // creation of OpenGL textures for test apps. JC
-        BOOL is_fallback = !is_first_found || !mCreateGLTextures;
+        bool is_fallback = !is_first_found || !mCreateGLTextures;
         F32 extra_scale = (is_fallback)?fallback_scale:1.0;
         F32 point_size_scale = extra_scale * point_size;
         bool is_font_loaded = false;