Merge branch 'DRTVWR-600-maint-A' into signal/trim-trailing

1 files changed, 4 insertions, 4 deletions

diff --git a/indra/llui/lldockablefloater.h b/indra/llui/lldockablefloater.h
index e7ceb235a7..3effc977db 100644
--- a/indra/llui/lldockablefloater.h
+++ b/indra/llui/lldockablefloater.h
@@ -81,7 +81,7 @@ public:
      *  If descendant class overrides postBuild() in order to perform specific
      *  construction then it must still invoke its superclass' implementation.
      */
-    /* virtula */BOOL postBuild();
+    /* virtula */bool postBuild();
     /* virtual */void setDocked(bool docked, bool pop_on_undock = true);
     /* virtual */void draw();
 
@@ -89,13 +89,13 @@ public:
      *  If descendant class overrides setVisible() then it must still invoke its
      *  superclass' implementation.
      */
-    /*virtual*/ void setVisible(BOOL visible);
+    /*virtual*/ void setVisible(bool visible);
 
     /**
      *  If descendant class overrides setMinimized() then it must still invoke its
      *  superclass' implementation.
      */
-    /*virtual*/ void setMinimized(BOOL minimize);
+    /*virtual*/ void setMinimized(bool minimize);
 
     LLView * getDockWidget();
 
@@ -129,7 +129,7 @@ protected:
 
     // Checks if docking should be forced.
     // It may be useful e.g. if floater created in mouselook mode (see EXT-5609)
-    boost::function<BOOL ()> mIsDockedStateForcedCallback;
+    boost::function<bool ()> mIsDockedStateForcedCallback;
 
 private:
     std::unique_ptr<LLDockControl> mDockControl;