Merge pull request #2450 from secondlife/lua-merge

Merge updated 'main' branch into release/luau-scripting

1 files changed, 6 insertions, 6 deletions

diff --git a/indra/newview/llpanelblockedlist.h b/indra/newview/llpanelblockedlist.h
index 59bdd1b6a6..446f3d4bad 100644
--- a/indra/newview/llpanelblockedlist.h
+++ b/indra/newview/llpanelblockedlist.h
@@ -40,9 +40,9 @@ public:
     LLPanelBlockedList();
     ~LLPanelBlockedList(){};
 
-    virtual BOOL postBuild();
-    virtual void draw();
-    virtual void onOpen(const LLSD& key);
+    bool postBuild() override;
+    void draw() override;
+    void onOpen(const LLSD& key) override;
 
     void selectBlocked(const LLUUID& id);
 
@@ -72,7 +72,7 @@ private:
 
     // List commnads
     void onCustomAction(const LLSD& userdata);
-    BOOL isActionChecked(const LLSD& userdata);
+    bool isActionChecked(const LLSD& userdata);
 
     void callbackBlockPicked(const uuid_vec_t& ids, const std::vector<LLAvatarName> names);
     static void callbackBlockByName(const std::string& text);
@@ -92,9 +92,9 @@ class LLFloaterGetBlockedObjectName : public LLFloater
 public:
     typedef boost::function<void (const std::string&)> get_object_name_callback_t;
 
-    virtual BOOL postBuild();
+    bool postBuild() override;
 
-    virtual BOOL handleKeyHere(KEY key, MASK mask);
+    bool handleKeyHere(KEY key, MASK mask) override;
 
     static LLFloaterGetBlockedObjectName* show(get_object_name_callback_t callback);