Merge branch 'release/luau-scripting' into lua-resultset

1 files changed, 3 insertions, 3 deletions

diff --git a/indra/newview/llfloatermemleak.h b/indra/newview/llfloatermemleak.h
index 6b760cc236..810c946e61 100644
--- a/indra/newview/llfloatermemleak.h
+++ b/indra/newview/llfloatermemleak.h
@@ -35,8 +35,8 @@ class LLFloaterMemLeak : public LLFloater
 public:
     /// initialize all the callbacks for the menu
 
-    virtual BOOL postBuild() ;
-    virtual void draw() ;
+    bool postBuild() override;
+    void draw() override;
 
     void onChangeLeakingSpeed();
     void onChangeMaxMemLeaking();
@@ -67,7 +67,7 @@ private:
     static U32 sMaxLeakedMem ; //maximum allowed leaked memory
     static U32 sTotalLeaked ;
     static S32 sStatus ; //0: stop ; >0: start ; <0: release
-    static BOOL sbAllocationFailed ;
+    static bool sbAllocationFailed ;
 
     std::vector<char*> mLeakedMem ;
 };