Merge pull request #1745 from secondlife/project/gltf_development

move project/gltf development to develop

1 files changed, 5 insertions, 5 deletions

diff --git a/indra/newview/llviewerwearable.h b/indra/newview/llviewerwearable.h
index 15feab0a57..233c65aefb 100644
--- a/indra/newview/llviewerwearable.h
+++ b/indra/newview/llviewerwearable.h
@@ -58,8 +58,8 @@ public:
 
 public:
 
-    BOOL                isDirty() const;
-    BOOL                isOldVersion() const;
+    bool                isDirty() const;
+    bool                isOldVersion() const;
 
     /*virtual*/ void    writeToAvatar(LLAvatarAppearance *avatarp);
     void                removeFromAvatar()  { LLViewerWearable::removeFromAvatar( mType); }
@@ -69,8 +69,8 @@ public:
 
     void                setParamsToDefaults();
     void                setTexturesToDefaults();
-    void                setVolatile(BOOL is_volatile) { mVolatile = is_volatile; } // TRUE when doing preview renders, some updates will be suppressed.
-    BOOL                getVolatile() { return mVolatile; }
+    void                setVolatile(bool is_volatile) { mVolatile = is_volatile; } // true when doing preview renders, some updates will be suppressed.
+    bool                getVolatile() { return mVolatile; }
 
     /*virtual*/ LLUUID  getDefaultTextureImageID(LLAvatarAppearanceDefines::ETextureIndex index) const;
 
@@ -98,7 +98,7 @@ protected:
     LLAssetID           mAssetID;
     LLTransactionID     mTransactionID;
 
-    BOOL                mVolatile; // True when rendering preview images. Can suppress some updates.
+    bool                mVolatile; // True when rendering preview images. Can suppress some updates.
 
     LLUUID              mItemID;  // ID of the inventory item in the agent's inventory
 };