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

1 files changed, 10 insertions, 10 deletions

diff --git a/indra/newview/llmutelist.h b/indra/newview/llmutelist.h
index fc47e507c3..13d579c61f 100644
--- a/indra/newview/llmutelist.h
+++ b/indra/newview/llmutelist.h
@@ -89,25 +89,25 @@ public:
     void removeObserver(LLMuteListObserver* observer);
 
     // Add either a normal or a BY_NAME mute, for any or all properties.
-    BOOL add(const LLMute& mute, U32 flags = 0);
+    bool add(const LLMute& mute, U32 flags = 0);
 
     // Remove both normal and legacy mutes, for any or all properties.
-    BOOL remove(const LLMute& mute, U32 flags = 0);
-    BOOL autoRemove(const LLUUID& agent_id, const EAutoReason reason);
+    bool remove(const LLMute& mute, U32 flags = 0);
+    bool autoRemove(const LLUUID& agent_id, const EAutoReason reason);
 
     // Name is required to test against legacy text-only mutes.
-    BOOL isMuted(const LLUUID& id, const std::string& name = LLStringUtil::null, U32 flags = 0) const;
+    bool isMuted(const LLUUID& id, const std::string& name = LLStringUtil::null, U32 flags = 0) const;
 
     // Workaround for username-based mute search, a lot of string conversions so use cautiously
     // Expects lower case username
-    BOOL isMuted(const std::string& username, U32 flags = 0) const;
+    bool isMuted(const std::string& username, U32 flags = 0) const;
 
     // Alternate (convenience) form for places we don't need to pass the name, but do need flags
-    BOOL isMuted(const LLUUID& id, U32 flags) const { return isMuted(id, LLStringUtil::null, flags); };
+    bool isMuted(const LLUUID& id, U32 flags) const { return isMuted(id, LLStringUtil::null, flags); };
 
     static bool isLinden(const std::string& name);
 
-    BOOL isLoaded() const { return mIsLoaded; }
+    bool isLoaded() const { return mIsLoaded; }
 
     std::vector<LLMute> getMutes() const;
 
@@ -118,8 +118,8 @@ public:
     void cache(const LLUUID& agent_id);
 
 private:
-    BOOL loadFromFile(const std::string& filename);
-    BOOL saveToFile(const std::string& filename);
+    bool loadFromFile(const std::string& filename);
+    bool saveToFile(const std::string& filename);
 
     void setLoaded();
     void notifyObservers();
@@ -167,7 +167,7 @@ private:
     typedef std::set<LLMuteListObserver*> observer_set_t;
     observer_set_t mObservers;
 
-    BOOL mIsLoaded;
+    bool mIsLoaded;
 
     friend class LLDispatchEmptyMuteList;
 };