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

1 files changed, 11 insertions, 11 deletions

diff --git a/indra/newview/llpanelmaininventory.h b/indra/newview/llpanelmaininventory.h
index 33205fc062..cad2501645 100644
--- a/indra/newview/llpanelmaininventory.h
+++ b/indra/newview/llpanelmaininventory.h
@@ -65,7 +65,7 @@ public:
     LLPanelMainInventory(const LLPanel::Params& p = getDefaultParams());
     ~LLPanelMainInventory();
 
-    BOOL postBuild();
+    bool postBuild();
 
     enum EViewModeType
     {
@@ -74,17 +74,17 @@ public:
         MODE_COMBINATION
     };
 
-    virtual BOOL handleKeyHere(KEY key, MASK mask);
+    virtual bool handleKeyHere(KEY key, MASK mask);
 
     // Inherited functionality
-    /*virtual*/ BOOL handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop,
+    /*virtual*/ bool handleDragAndDrop(S32 x, S32 y, MASK mask, bool drop,
                                        EDragAndDropType cargo_type,
                                        void* cargo_data,
                                        EAcceptance* accept,
                                        std::string& tooltip_msg);
     /*virtual*/ void changed(U32);
     /*virtual*/ void draw();
-    /*virtual*/ void    onVisibilityChange ( BOOL new_visibility );
+    /*virtual*/ void    onVisibilityChange ( bool new_visibility );
 
     LLInventoryPanel* getPanel() { return mActivePanel; }
     LLInventoryPanel* getActivePanel() { return mActivePanel; }
@@ -144,14 +144,14 @@ protected:
     void setFilterTextFromFilter();
     void startSearch();
 
-    void onSelectionChange(LLInventoryPanel *panel, const std::deque<LLFolderViewItem*>& items, BOOL user_action);
+    void onSelectionChange(LLInventoryPanel *panel, const std::deque<LLFolderViewItem*>& items, bool user_action);
 
-    static BOOL filtersVisible(void* user_data);
+    static bool filtersVisible(void* user_data);
     void onClearSearch();
     static void onFoldersByName(void *user_data);
-    static BOOL checkFoldersByName(void *user_data);
+    static bool checkFoldersByName(void *user_data);
 
-    static BOOL incrementalFind(LLFolderViewItem* first_item, const char *find_text, BOOL backward);
+    static bool incrementalFind(LLFolderViewItem* first_item, const char *find_text, bool backward);
     void onFilterSelected();
 
     const std::string getFilterSubString();
@@ -224,8 +224,8 @@ protected:
     void onAddButtonClick();
     void showActionMenu(LLMenuGL* menu, std::string spawning_view_name);
     void onClipboardAction(const LLSD& userdata);
-    BOOL isActionEnabled(const LLSD& command_name);
-    BOOL isActionChecked(const LLSD& userdata);
+    bool isActionEnabled(const LLSD& command_name);
+    bool isActionChecked(const LLSD& userdata);
     void onCustomAction(const LLSD& command_name);
     bool isActionVisible(const LLSD& userdata);
     static bool hasSettingsInventory();
@@ -235,7 +235,7 @@ protected:
 
     void onCombinationRootChanged(bool gallery_clicked);
     void onCombinationGallerySelectionChanged(const LLUUID& category_id);
-    void onCombinationInventorySelectionChanged(const std::deque<LLFolderViewItem*>& items, BOOL user_action);
+    void onCombinationInventorySelectionChanged(const std::deque<LLFolderViewItem*>& items, bool user_action);
     /**
      * Set upload cost in "Upload" sub menu.
      */