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

1 files changed, 5 insertions, 5 deletions

diff --git a/indra/llmessage/lluseroperation.h b/indra/llmessage/lluseroperation.h
index 7db5f0b27f..9d0f4d04d1 100644
--- a/indra/llmessage/lluseroperation.h
+++ b/indra/llmessage/lluseroperation.h
@@ -44,17 +44,17 @@ public:
 	const LLUUID& getAgentID() const { return mAgentID; }
 
 	// Operation never got necessary data, so expired	
-	virtual BOOL isExpired();
+	virtual bool isExpired();
 
 	// ability to mark this operation as never expiring.
-	void SetNoExpireFlag(const BOOL flag);
+	void SetNoExpireFlag(const bool flag);
 
 	// Send request to the dataserver
 	virtual void sendRequest() = 0;
 
 	// Run the operation. This will only be called in the case of an
 	// actual success or failure of the operation.
-	virtual BOOL execute(BOOL transaction_success) = 0;	
+	virtual bool execute(bool transaction_success) = 0;
 
 	// This method is called when the user op has expired, and is
 	// about to be deleted by the manager. This gives the user op the
@@ -68,7 +68,7 @@ protected:
 	LLUUID mAgentID;
 	LLUUID mTransactionID;
 	LLFrameTimer mTimer;
-	BOOL   mNoExpire;			// this is used for operations that expect an answer and will wait till it gets one. 
+	bool   mNoExpire;			// this is used for operations that expect an answer and will wait till it gets one.
 };
 
 
@@ -80,7 +80,7 @@ public:
 
 	void addOperation(LLUserOperation* op);
 	LLUserOperation* findOperation(const LLUUID& transaction_id);
-	BOOL deleteOperation(LLUserOperation* op);
+	bool deleteOperation(LLUserOperation* op);
 
 	// Call this method every once in a while to clean up old
 	// transactions.