Merge pull request #2450 from secondlife/lua-merge

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

1 files changed, 2 insertions, 2 deletions

diff --git a/indra/llui/llscrollingpanellist.h b/indra/llui/llscrollingpanellist.h
index ad717a455b..309ce4592d 100644
--- a/indra/llui/llscrollingpanellist.h
+++ b/indra/llui/llscrollingpanellist.h
@@ -40,7 +40,7 @@ class LLScrollingPanel : public LLPanel
 {
 public:
     LLScrollingPanel(const LLPanel::Params& params) : LLPanel(params) {}
-    virtual void updatePanel(BOOL allow_modify) = 0;
+    virtual void updatePanel(bool allow_modify) = 0;
 };
 
 
@@ -74,7 +74,7 @@ public:
     S32                 addPanel(LLScrollingPanel* panel, bool back = false);
     void                removePanel(LLScrollingPanel* panel);
     void                removePanel(U32 panel_index);
-    void                updatePanels(BOOL allow_modify);
+    void                updatePanels(bool allow_modify);
     void                rearrange();
 
     const panel_list_t& getPanelList() const { return mPanelList; }