Merge branch 'release/luau-scripting' into lua-resultset

1 files changed, 20 insertions, 20 deletions

diff --git a/indra/newview/llfeaturemanager.h b/indra/newview/llfeaturemanager.h
index c333e2caeb..22de6afbae 100644
--- a/indra/newview/llfeaturemanager.h
+++ b/indra/newview/llfeaturemanager.h
@@ -50,15 +50,15 @@ typedef enum EGPUClass
 class LLFeatureInfo
 {
 public:
-    LLFeatureInfo() : mValid(FALSE), mAvailable(FALSE), mRecommendedLevel(-1) {}
-    LLFeatureInfo(const std::string& name, const BOOL available, const F32 level);
+    LLFeatureInfo() : mValid(false), mAvailable(false), mRecommendedLevel(-1) {}
+    LLFeatureInfo(const std::string& name, const bool available, const F32 level);
 
-    BOOL isValid() const    { return mValid; };
+    bool isValid() const    { return mValid; };
 
 public:
-    BOOL        mValid;
+    bool        mValid;
     std::string mName;
-    BOOL        mAvailable;
+    bool        mAvailable;
     F32         mRecommendedLevel;
 };
 
@@ -71,17 +71,17 @@ public:
     LLFeatureList(const std::string& name);
     virtual ~LLFeatureList();
 
-    BOOL isFeatureAvailable(const std::string& name);
+    bool isFeatureAvailable(const std::string& name);
     F32 getRecommendedValue(const std::string& name);
 
-    void setFeatureAvailable(const std::string& name, const BOOL available);
+    void setFeatureAvailable(const std::string& name, const bool available);
     void setRecommendedLevel(const std::string& name, const F32 level);
 
     bool loadFeatureList(LLFILE *fp);
 
-    BOOL maskList(LLFeatureList &mask);
+    bool maskList(LLFeatureList &mask);
 
-    void addFeature(const std::string& name, const BOOL available, const F32 level);
+    void addFeature(const std::string& name, const bool available, const F32 level);
 
     feature_map_t& getFeatures()
     {
@@ -115,17 +115,17 @@ public:
     // get the measured GPU memory bandwidth in GB/sec
     // may return 0 of benchmark has not been run or failed to run
     F32 getGPUMemoryBandwidth() { return mGPUMemoryBandwidth; }
-    BOOL isGPUSupported()               { return mGPUSupported; }
+    bool isGPUSupported()               { return mGPUSupported; }
     F32 getExpectedGLVersion()          { return mExpectedGLVersion; }
 
     void cleanupFeatureTables();
 
     S32 getVersion() const              { return mTableVersion; }
-    void setSafe(const BOOL safe)       { mSafe = safe; }
-    BOOL isSafe() const                 { return mSafe; }
+    void setSafe(const bool safe)       { mSafe = safe; }
+    bool isSafe() const                 { return mSafe; }
 
     LLFeatureList *findMask(const std::string& name);
-    BOOL maskFeatures(const std::string& name);
+    bool maskFeatures(const std::string& name);
 
     // set the graphics to low, medium, high, or ultra.
     // skipFeatures forces skipping of mostly hardware settings
@@ -156,32 +156,32 @@ protected:
     bool loadGPUClass();
 
     bool parseFeatureTable(std::string filename);
-    ///< @returns TRUE is file parsed correctly, FALSE if not
+    ///< @returns true is file parsed correctly, false if not
 
     void initBaseMask();
 
     std::map<std::string, LLFeatureList *> mMaskList;
     std::set<std::string> mSkippedFeatures;
-    BOOL        mInited;
+    bool        mInited;
     S32         mTableVersion;
-    BOOL        mSafe;                  // Reinitialize everything to the "safe" mask
+    bool        mSafe;                  // Reinitialize everything to the "safe" mask
     EGPUClass   mGPUClass;
     F32         mGPUMemoryBandwidth = 0.f;  // measured memory bandwidth of GPU in GB/second
     F32         mExpectedGLVersion;     //expected GL version according to gpu table
     std::string mGPUString;
-    BOOL        mGPUSupported;
+    bool        mGPUSupported;
 };
 
 inline
 LLFeatureManager::LLFeatureManager()
 :   LLFeatureList("default"),
 
-    mInited(FALSE),
+    mInited(false),
     mTableVersion(0),
-    mSafe(FALSE),
+    mSafe(false),
     mGPUClass(GPU_CLASS_UNKNOWN),
     mExpectedGLVersion(0.f),
-    mGPUSupported(FALSE)
+    mGPUSupported(false)
 {
 }