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

1 files changed, 3 insertions, 3 deletions

diff --git a/indra/newview/llfloatervoiceeffect.h b/indra/newview/llfloatervoiceeffect.h
index f45c46dcd9..323beb64ae 100644
--- a/indra/newview/llfloatervoiceeffect.h
+++ b/indra/newview/llfloatervoiceeffect.h
@@ -44,8 +44,8 @@ public:
     LLFloaterVoiceEffect(const LLSD& key);
     virtual ~LLFloaterVoiceEffect();
 
-    virtual BOOL postBuild();
-    virtual void onClose(bool app_quitting);
+    bool postBuild() override;
+    void onClose(bool app_quitting) override;
 
 private:
     enum ColumnIndex
@@ -58,7 +58,7 @@ private:
     void updateControls();
 
     /// Called by voice effect provider when voice effect list is changed.
-    virtual void onVoiceEffectChanged(bool effect_list_updated);
+    virtual void onVoiceEffectChanged(bool effect_list_updated) override;
 
     void onClickRecord();
     void onClickPlay();