Merge branch 'develop' of github.com:secondlife/viewer into roxie/webrtc-voice

1 files changed, 2 insertions, 2 deletions

diff --git a/indra/llappearance/lltexglobalcolor.h b/indra/llappearance/lltexglobalcolor.h
index 183eb47a4a..7561ea7df9 100644
--- a/indra/llappearance/lltexglobalcolor.h
+++ b/indra/llappearance/lltexglobalcolor.h
@@ -42,7 +42,7 @@ public:
 
     LLTexGlobalColorInfo*   getInfo() const { return mInfo; }
     //   This sets mInfo and calls initialization functions
-    BOOL                    setInfo(LLTexGlobalColorInfo *info);
+    bool                    setInfo(LLTexGlobalColorInfo *info);
 
     LLAvatarAppearance*     getAvatarAppearance()   const       { return mAvatarAppearance; }
     LLColor4                getColor() const;
@@ -62,7 +62,7 @@ public:
     LLTexGlobalColorInfo();
     ~LLTexGlobalColorInfo();
 
-    BOOL parseXml(LLXmlTreeNode* node);
+    bool parseXml(LLXmlTreeNode* node);
 
 private:
     param_color_info_list_t     mParamColorInfoList;