Merge pull request #1745 from secondlife/project/gltf_development

move project/gltf development to develop

1 files changed, 2 insertions, 2 deletions

diff --git a/indra/newview/llappearancemgr.h b/indra/newview/llappearancemgr.h
index e5de92b653..6c45a32856 100644
--- a/indra/newview/llappearancemgr.h
+++ b/indra/newview/llappearancemgr.h
@@ -87,7 +87,7 @@ public:
                              LLPointer<LLInventoryCallback> cb);
 
     // Return whether this folder contains minimal contents suitable for making a full outfit.
-    BOOL getCanMakeFolderIntoOutfit(const LLUUID& folder_id);
+    bool getCanMakeFolderIntoOutfit(const LLUUID& folder_id);
 
     // Determine whether a given outfit can be removed.
     bool getCanRemoveOutfit(const LLUUID& outfit_cat_id);
@@ -292,7 +292,7 @@ private:
     // Item-specific convenience functions
 public:
     // Is this in the COF?
-    BOOL getIsInCOF(const LLUUID& obj_id) const;
+    bool getIsInCOF(const LLUUID& obj_id) const;
     bool getIsInCOF(const LLInventoryObject* obj) const;
     // Is this in the COF and can the user delete it from the COF?
     bool getIsProtectedCOFItem(const LLUUID& obj_id) const;