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

1 files changed, 8 insertions, 8 deletions

diff --git a/indra/newview/llfloaterbvhpreview.h b/indra/newview/llfloaterbvhpreview.h
index 9de74c39cd..ae64521492 100644
--- a/indra/newview/llfloaterbvhpreview.h
+++ b/indra/newview/llfloaterbvhpreview.h
@@ -47,18 +47,18 @@ public:
 
     /*virtual*/ S8 getType() const ;
 
-    BOOL    render();
+    bool    render();
     void    requestUpdate();
     void    rotate(F32 yaw_radians, F32 pitch_radians);
     void    zoom(F32 zoom_delta);
     void    setZoom(F32 zoom_amt);
     void    pan(F32 right, F32 up);
-    virtual BOOL needsUpdate() { return mNeedsUpdate; }
+    virtual bool needsUpdate() { return mNeedsUpdate; }
 
     LLVOAvatar* getDummyAvatar() { return mDummyAvatar; }
 
 protected:
-    BOOL                mNeedsUpdate;
+    bool                mNeedsUpdate;
     F32                 mCameraDistance;
     F32                 mCameraYaw;
     F32                 mCameraPitch;
@@ -73,12 +73,12 @@ public:
     LLFloaterBvhPreview(const std::string& filename);
     virtual ~LLFloaterBvhPreview();
 
-    BOOL postBuild();
+    bool postBuild();
 
-    BOOL handleMouseDown(S32 x, S32 y, MASK mask);
-    BOOL handleMouseUp(S32 x, S32 y, MASK mask);
-    BOOL handleHover(S32 x, S32 y, MASK mask);
-    BOOL handleScrollWheel(S32 x, S32 y, S32 clicks);
+    bool handleMouseDown(S32 x, S32 y, MASK mask);
+    bool handleMouseUp(S32 x, S32 y, MASK mask);
+    bool handleHover(S32 x, S32 y, MASK mask);
+    bool handleScrollWheel(S32 x, S32 y, S32 clicks);
     void onMouseCaptureLost();
 
     void refresh();