Merge branch 'develop' of github.com:secondlife/viewer into roxie/webrtc-voice

1 files changed, 7 insertions, 7 deletions

diff --git a/indra/newview/llhudeffect.h b/indra/newview/llhudeffect.h
index e5f05599c9..cace745de6 100644
--- a/indra/newview/llhudeffect.h
+++ b/indra/newview/llhudeffect.h
@@ -40,17 +40,17 @@ class LLMessageSystem;
 class LLHUDEffect : public LLHUDObject
 {
 public:
-    void setNeedsSendToSim(const BOOL send_to_sim);
-    BOOL getNeedsSendToSim() const;
-    void setOriginatedHere(const BOOL orig_here);
-    BOOL getOriginatedHere() const;
+    void setNeedsSendToSim(const bool send_to_sim);
+    bool getNeedsSendToSim() const;
+    void setOriginatedHere(const bool orig_here);
+    bool getOriginatedHere() const;
 
     void setDuration(const F32 duration);
     void setColor(const LLColor4U &color);
     void setID(const LLUUID &id);
     const LLUUID &getID() const;
 
-    BOOL isDead() const;
+    bool isDead() const;
 
     friend class LLHUDManager;
 protected:
@@ -70,8 +70,8 @@ protected:
     F32         mDuration;
     LLColor4U   mColor;
 
-    BOOL        mNeedsSendToSim;
-    BOOL        mOriginatedHere;
+    bool        mNeedsSendToSim;
+    bool        mOriginatedHere;
 };
 
 #endif // LL_LLHUDEFFECT_H