Merge pull request #1745 from secondlife/project/gltf_development

move project/gltf development to develop

1 files changed, 4 insertions, 4 deletions

diff --git a/indra/newview/llfloaterpathfindingcharacters.h b/indra/newview/llfloaterpathfindingcharacters.h
index 4f9c7aadc0..1215bb72ec 100644
--- a/indra/newview/llfloaterpathfindingcharacters.h
+++ b/indra/newview/llfloaterpathfindingcharacters.h
@@ -44,10 +44,10 @@ class LLFloaterPathfindingCharacters : public LLFloaterPathfindingObjects
 public:
     virtual void                                    onClose(bool pIsAppQuitting);
 
-    BOOL                                            isShowPhysicsCapsule() const;
-    void                                            setShowPhysicsCapsule(BOOL pIsShowPhysicsCapsule);
+    bool                                            isShowPhysicsCapsule() const;
+    void                                            setShowPhysicsCapsule(bool pIsShowPhysicsCapsule);
 
-    BOOL                                            isPhysicsCapsuleEnabled(LLUUID& id, LLVector3& pos, LLQuaternion& rot) const;
+    bool                                            isPhysicsCapsuleEnabled(LLUUID& id, LLVector3& pos, LLQuaternion& rot) const;
 
     static void                                     openCharactersWithSelectedObjects();
     static LLHandle<LLFloaterPathfindingCharacters> getInstanceHandle();
@@ -58,7 +58,7 @@ protected:
     LLFloaterPathfindingCharacters(const LLSD& pSeed);
     virtual ~LLFloaterPathfindingCharacters();
 
-    virtual BOOL                       postBuild();
+    virtual bool                       postBuild();
 
     virtual void                       requestGetObjects();