Merge branch 'develop' into nat/edu-channel

1 files changed, 3 insertions, 3 deletions

diff --git a/indra/newview/llhudobject.h b/indra/newview/llhudobject.h
index 13953d2329..8c628e3f92 100644
--- a/indra/newview/llhudobject.h
+++ b/indra/newview/llhudobject.h
@@ -58,7 +58,7 @@ public:
     void setPositionGlobal(const LLVector3d &position_global);
     void setPositionAgent(const LLVector3 &position_agent);
 
-    BOOL isVisible() const { return mVisible; }
+    bool isVisible() const { return mVisible; }
 
     U8 getType() const { return mType; }
 
@@ -109,8 +109,8 @@ protected:
 
 protected:
     U8              mType;
-    BOOL            mDead;
-    BOOL            mVisible;
+    bool            mDead;
+    bool            mVisible;
     LLVector3d      mPositionGlobal;
     LLPointer<LLViewerObject> mSourceObject;
     LLPointer<LLViewerObject> mTargetObject;