Merge pull request #2450 from secondlife/lua-merge

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

1 files changed, 2 insertions, 2 deletions

diff --git a/indra/llcommon/llworkerthread.h b/indra/llcommon/llworkerthread.h
index 01c96852d3..2a68584ab3 100644
--- a/indra/llcommon/llworkerthread.h
+++ b/indra/llcommon/llworkerthread.h
@@ -137,7 +137,7 @@ public:
     LLWorkerClass(LLWorkerThread* workerthread, const std::string& name);
     virtual ~LLWorkerClass();
 
-    // pure virtual, called from WORKER THREAD, returns TRUE if done
+    // pure virtual, called from WORKER THREAD, returns true if done
     virtual bool doWork(S32 param)=0; // Called from WorkRequest::processRequest()
     // virtual, called from finishRequest() after completed or aborted
     virtual void finishWork(S32 param, bool completed); // called from finishRequest() (WORK THREAD)
@@ -178,7 +178,7 @@ private:
     void clearFlags(U32 flags) { mWorkFlags = mWorkFlags & ~flags; }
     U32  getFlags() { return mWorkFlags; }
 public:
-    bool getFlags(U32 flags) { return mWorkFlags & flags ? true : false; }
+    bool getFlags(U32 flags) { return (mWorkFlags & flags) != 0; }
 
 private:
     // pure virtuals