Merge remote-tracking branch 'origin/DRTVWR-600-maint-A' into gltf-dev-maint-a-merge

1 files changed, 4 insertions, 4 deletions

diff --git a/indra/llcharacter/llgesture.h b/indra/llcharacter/llgesture.h
index cfb489f727..22db9bc565 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,10 +84,10 @@ 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(); }