Merge pull request #1745 from secondlife/project/gltf_development

move project/gltf development to develop

1 files changed, 8 insertions, 8 deletions

diff --git a/indra/llmessage/llpartdata.h b/indra/llmessage/llpartdata.h
index 35602dc949..49b9e51a3d 100644
--- a/indra/llmessage/llpartdata.h
+++ b/indra/llmessage/llpartdata.h
@@ -88,10 +88,10 @@ public:
         mParameter(0.f)
     {
     }
-    BOOL unpackLegacy(LLDataPacker &dp);
-    BOOL unpack(LLDataPacker &dp);
+    bool unpackLegacy(LLDataPacker &dp);
+    bool unpack(LLDataPacker &dp);
 
-    BOOL pack(LLDataPacker &dp);
+    bool pack(LLDataPacker &dp);
 
     bool hasGlow() const;
     bool hasBlendFunc() const;
@@ -183,11 +183,11 @@ class LLPartSysData
 public:
     LLPartSysData();
 
-    BOOL unpack(LLDataPacker &dp);
-    BOOL unpackLegacy(LLDataPacker &dp);
-    BOOL unpackBlock(const S32 block_num);
+    bool unpack(LLDataPacker &dp);
+    bool unpackLegacy(LLDataPacker &dp);
+    bool unpackBlock(const S32 block_num);
 
-    static BOOL isNullPS(const S32 block_num); // Returns FALSE if this is a "NULL" particle system (i.e. no system)
+    static bool isNullPS(const S32 block_num); // Returns false if this is a "NULL" particle system (i.e. no system)
 
     bool isLegacyCompatible() const;
 
@@ -227,7 +227,7 @@ public:
     S32 getdataBlockSize() const;
 
 private:
-    BOOL unpackSystem(LLDataPacker &dp);
+    bool unpackSystem(LLDataPacker &dp);
 
 public:
     // Public because I'm lazy....