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

1 files changed, 4 insertions, 4 deletions

diff --git a/indra/newview/lltoolbarview.h b/indra/newview/lltoolbarview.h
index 19f72102c1..7cecd81052 100644
--- a/indra/newview/lltoolbarview.h
+++ b/indra/newview/lltoolbarview.h
@@ -67,8 +67,8 @@ public:
 
     // Derived methods
     virtual ~LLToolBarView();
-    virtual BOOL postBuild();
-    virtual void draw();
+    bool postBuild() override;
+    void draw() override;
 
     // Toolbar view interface with the rest of the world
     // Checks if the commandId is being used somewhere in one of the toolbars, returns LLToolBarEnums::EToolBarLocation
@@ -91,8 +91,8 @@ public:
     static bool clearAllToolbars();
 
     static void startDragTool(S32 x, S32 y, LLToolBarButton* toolbarButton);
-    static BOOL handleDragTool(S32 x, S32 y, const LLUUID& uuid, LLAssetType::EType type);
-    static BOOL handleDropTool(void* cargo_data, S32 x, S32 y, LLToolBar* toolbar);
+    static bool handleDragTool(S32 x, S32 y, const LLUUID& uuid, LLAssetType::EType type);
+    static bool handleDropTool(void* cargo_data, S32 x, S32 y, LLToolBar* toolbar);
     static void resetDragTool(LLToolBarButton* toolbarButton);
     LLInventoryObject* getDragItem();
     LLView* getBottomToolbar() { return mBottomToolbarPanel; }