Merge branch 'develop' into nat/edu-channel

1 files changed, 4 insertions, 4 deletions

diff --git a/indra/newview/llfloatermap.h b/indra/newview/llfloatermap.h
index 333424ba71..1955372567 100644
--- a/indra/newview/llfloatermap.h
+++ b/indra/newview/llfloatermap.h
@@ -42,10 +42,10 @@ public:
     static LLFloaterMap* getInstance();
     virtual ~LLFloaterMap();
 
-    /*virtual*/ BOOL    postBuild();
-    /*virtual*/ BOOL    handleDoubleClick( S32 x, S32 y, MASK mask );
-    /*virtual*/ void    reshape(S32 width, S32 height, BOOL called_from_parent = TRUE);
-    /*virtual*/ void    draw();
+    bool    postBuild() override;
+    bool    handleDoubleClick( S32 x, S32 y, MASK mask ) override;
+    void    reshape(S32 width, S32 height, bool called_from_parent = true) override;
+    void    draw() override;
 
 private:
     void setDirectionPos( LLTextBox* text_box, F32 rotation );