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

1 files changed, 5 insertions, 5 deletions

diff --git a/indra/llcharacter/llgesture.h b/indra/llcharacter/llgesture.h
index 4e7fb6d1cc..f8504d06d2 100644
--- a/indra/llcharacter/llgesture.h
+++ b/indra/llcharacter/llgesture.h
@@ -55,10 +55,10 @@ public:
     const std::string&  getOutputString() const { return mOutputString; }
 
     // Triggers if a key/mask matches it
-    virtual BOOL trigger(KEY key, MASK mask);
+    virtual bool trigger(KEY key, MASK mask);
 
     // Triggers if case-insensitive substring matches (assumes string is lowercase)
-    virtual BOOL trigger(const std::string &string);
+    virtual bool trigger(const std::string &string);
 
     // non-endian-neutral serialization
     U8 *serialize(U8 *buffer) const;
@@ -84,13 +84,13 @@ public:
     virtual ~LLGestureList();
 
     // Triggers if a key/mask matches one in the list
-    BOOL trigger(KEY key, MASK mask);
+    bool trigger(KEY key, MASK mask);
 
     // Triggers if substring matches and generates revised string.
-    BOOL triggerAndReviseString(const std::string &string, std::string* revised_string);
+    bool triggerAndReviseString(const std::string &string, std::string* revised_string);
 
     // Used for construction from UI
-    S32 count() const                       { return mList.size(); }
+    S32 count() const                       { return static_cast<S32>(mList.size()); }
     virtual LLGesture* get(S32 i) const     { return mList.at(i); }
     virtual void put(LLGesture* gesture)    { mList.push_back( gesture ); }
     void deleteAll();