Merge pull request #1745 from secondlife/project/gltf_development

move project/gltf development to develop

1 files changed, 3 insertions, 3 deletions

diff --git a/indra/newview/llpathfindingobject.h b/indra/newview/llpathfindingobject.h
index 2561e8d66f..17f12efd83 100644
--- a/indra/newview/llpathfindingobject.h
+++ b/indra/newview/llpathfindingobject.h
@@ -56,10 +56,10 @@ public:
     inline const LLUUID&      getUUID() const        {return mUUID;};
     inline const std::string& getName() const        {return mName;};
     inline const std::string& getDescription() const {return mDescription;};
-    inline BOOL               hasOwner() const       {return mOwnerUUID.notNull();};
+    inline bool               hasOwner() const       {return mOwnerUUID.notNull();};
     inline bool               hasOwnerName() const   {return mHasOwnerName;};
     std::string               getOwnerName() const;
-    inline BOOL               isGroupOwned() const   {return mIsGroupOwned;};
+    inline bool               isGroupOwned() const   {return mIsGroupOwned;};
     inline const LLVector3&   getLocation() const    {return mLocation;};
 
     typedef boost::function<void (const LLPathfindingObject *)>         name_callback_t;
@@ -84,7 +84,7 @@ private:
     bool                                     mHasOwnerName;
     LLAvatarName                             mOwnerName;
     LLAvatarNameCache::callback_connection_t mAvatarNameCacheConnection;
-    BOOL                                     mIsGroupOwned;
+    bool                                     mIsGroupOwned;
     LLVector3                                mLocation;
     name_signal_t                            mOwnerNameSignal;
 };