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

1 files changed, 4 insertions, 4 deletions

diff --git a/indra/newview/llpaneltopinfobar.h b/indra/newview/llpaneltopinfobar.h
index 0f072db175..f4238ad5e7 100644
--- a/indra/newview/llpaneltopinfobar.h
+++ b/indra/newview/llpaneltopinfobar.h
@@ -46,8 +46,8 @@ class LLPanelTopInfoBar : public LLPanel, public LLSingleton<LLPanelTopInfoBar>,
 public:
     typedef boost::signals2::signal<void ()> resize_signal_t;
 
-    /*virtual*/ BOOL postBuild() override;
-    /*virtual*/ void draw() override;
+    bool postBuild() override;
+    void draw() override;
 
     /**
      * Updates location and parcel icons on login complete
@@ -83,7 +83,7 @@ private:
      */
     void initParcelIcons();
 
-    BOOL handleRightMouseDown(S32 x, S32 y, MASK mask) override;
+    bool handleRightMouseDown(S32 x, S32 y, MASK mask) override;
 
     /**
      * Handles clicks on the parcel icons.
@@ -158,7 +158,7 @@ private:
     {
         if (LLPanelTopInfoBar::instanceExists())
         {
-            LLPanelTopInfoBar::getInstance()->setEnabled(FALSE);
+            LLPanelTopInfoBar::getInstance()->setEnabled(false);
         }
     }