Merge remote-tracking branch 'secondlife/release/2024.06-atlasaurus' into 2024.06-atlasaurus

1 files changed, 30 insertions, 32 deletions

diff --git a/indra/llwindow/llwindowheadless.h b/indra/llwindow/llwindowheadless.h
index af2cdb63fa..5696b69a59 100644
--- a/indra/llwindow/llwindowheadless.h
+++ b/indra/llwindow/llwindowheadless.h
@@ -35,10 +35,10 @@ public:
     /*virtual*/ void show() override {}
     /*virtual*/ void hide() override {}
     /*virtual*/ void close() override {}
-    /*virtual*/ BOOL getVisible() override {return FALSE;}
-    /*virtual*/ BOOL getMinimized() override {return FALSE;}
-    /*virtual*/ BOOL getMaximized() override {return FALSE;}
-    /*virtual*/ BOOL maximize() override {return FALSE;}
+    /*virtual*/ bool getVisible() override {return false;}
+    /*virtual*/ bool getMinimized() override {return false;}
+    /*virtual*/ bool getMaximized() override {return false;}
+    /*virtual*/ bool maximize() override {return false;}
     /*virtual*/ void minimize() override {}
     /*virtual*/ void restore() override {}
     // TODO: LLWindow::getFullscreen() is (intentionally?) NOT virtual.
@@ -46,42 +46,42 @@ public:
     // mistake to shadow the base-class method with an LLWindowHeadless
     // override when called on the subclass, yet call the base-class method
     // when indirecting through a polymorphic pointer or reference?
-    BOOL getFullscreen() {return FALSE;}
-    /*virtual*/ BOOL getPosition(LLCoordScreen *position) override {return FALSE;}
-    /*virtual*/ BOOL getSize(LLCoordScreen *size) override {return FALSE;}
-    /*virtual*/ BOOL getSize(LLCoordWindow *size) override {return FALSE;}
-    /*virtual*/ BOOL setPosition(LLCoordScreen position) override {return FALSE;}
-    /*virtual*/ BOOL setSizeImpl(LLCoordScreen size) override {return FALSE;}
-    /*virtual*/ BOOL setSizeImpl(LLCoordWindow size) override {return FALSE;}
-    /*virtual*/ BOOL switchContext(BOOL fullscreen, const LLCoordScreen &size, BOOL enable_vsync, const LLCoordScreen * const posp = NULL) override {return FALSE;}
+    bool getFullscreen() {return false;}
+    /*virtual*/ bool getPosition(LLCoordScreen *position) override {return false;}
+    /*virtual*/ bool getSize(LLCoordScreen *size) override {return false;}
+    /*virtual*/ bool getSize(LLCoordWindow *size) override {return false;}
+    /*virtual*/ bool setPosition(LLCoordScreen position) override {return false;}
+    /*virtual*/ bool setSizeImpl(LLCoordScreen size) override {return false;}
+    /*virtual*/ bool setSizeImpl(LLCoordWindow size) override {return false;}
+    /*virtual*/ bool switchContext(bool fullscreen, const LLCoordScreen &size, bool enable_vsync, const LLCoordScreen * const posp = NULL) override {return false;}
     void* createSharedContext() override  { return nullptr; }
     void makeContextCurrent(void*) override  {}
     void destroySharedContext(void*) override  {}
     /*virtual*/ void toggleVSync(bool enable_vsync) override { }
-    /*virtual*/ BOOL setCursorPosition(LLCoordWindow position) override {return FALSE;}
-    /*virtual*/ BOOL getCursorPosition(LLCoordWindow *position) override {return FALSE;}
+    /*virtual*/ bool setCursorPosition(LLCoordWindow position) override {return false;}
+    /*virtual*/ bool getCursorPosition(LLCoordWindow *position) override {return false;}
 #if LL_WINDOWS
-    /*virtual*/ BOOL getCursorDelta(LLCoordCommon* delta) override { return FALSE; }
+    /*virtual*/ bool getCursorDelta(LLCoordCommon* delta) override { return false; }
 #endif
     /*virtual*/ void showCursor() override {}
     /*virtual*/ void hideCursor() override {}
     /*virtual*/ void showCursorFromMouseMove() override {}
     /*virtual*/ void hideCursorUntilMouseMove() override {}
-    /*virtual*/ BOOL isCursorHidden() override {return FALSE;}
+    /*virtual*/ bool isCursorHidden() override {return false;}
     /*virtual*/ void updateCursor() override {}
     //virtual ECursorType getCursor() override { return mCurrentCursor; }
     /*virtual*/ void captureMouse() override {}
     /*virtual*/ void releaseMouse() override {}
-    /*virtual*/ void setMouseClipping( BOOL b ) override {}
-    /*virtual*/ BOOL isClipboardTextAvailable() override {return FALSE; }
-    /*virtual*/ BOOL pasteTextFromClipboard(LLWString &dst) override {return FALSE; }
-    /*virtual*/ BOOL copyTextToClipboard(const LLWString &src) override {return FALSE; }
+    /*virtual*/ void setMouseClipping( bool b ) override {}
+    /*virtual*/ bool isClipboardTextAvailable() override {return false; }
+    /*virtual*/ bool pasteTextFromClipboard(LLWString &dst) override {return false; }
+    /*virtual*/ bool copyTextToClipboard(const LLWString &src) override {return false; }
     /*virtual*/ void flashIcon(F32 seconds) override {}
     /*virtual*/ F32 getGamma() override {return 1.0f; }
-    /*virtual*/ BOOL setGamma(const F32 gamma) override {return FALSE; } // Set the gamma
+    /*virtual*/ bool setGamma(const F32 gamma) override {return false; } // Set the gamma
     /*virtual*/ void setFSAASamples(const U32 fsaa_samples) override { }
     /*virtual*/ U32 getFSAASamples() override { return 0; }
-    /*virtual*/ BOOL restoreGamma() override {return FALSE; }   // Restore original gamma table (before updating gamma)
+    /*virtual*/ bool restoreGamma() override {return false; }   // Restore original gamma table (before updating gamma)
     //virtual ESwapMethod getSwapMethod() override { return mSwapMethod; }
     /*virtual*/ void gatherInput() override {}
     /*virtual*/ void delayInputProcessing() override {}
@@ -89,20 +89,18 @@ public:
 
 
     // handy coordinate space conversion routines
-    /*virtual*/ BOOL convertCoords(LLCoordScreen from, LLCoordWindow *to) override { return FALSE; }
-    /*virtual*/ BOOL convertCoords(LLCoordWindow from, LLCoordScreen *to) override { return FALSE; }
-    /*virtual*/ BOOL convertCoords(LLCoordWindow from, LLCoordGL *to) override { return FALSE; }
-    /*virtual*/ BOOL convertCoords(LLCoordGL from, LLCoordWindow *to) override { return FALSE; }
-    /*virtual*/ BOOL convertCoords(LLCoordScreen from, LLCoordGL *to) override { return FALSE; }
-    /*virtual*/ BOOL convertCoords(LLCoordGL from, LLCoordScreen *to) override { return FALSE; }
+    /*virtual*/ bool convertCoords(LLCoordScreen from, LLCoordWindow *to) override { return false; }
+    /*virtual*/ bool convertCoords(LLCoordWindow from, LLCoordScreen *to) override { return false; }
+    /*virtual*/ bool convertCoords(LLCoordWindow from, LLCoordGL *to) override { return false; }
+    /*virtual*/ bool convertCoords(LLCoordGL from, LLCoordWindow *to) override { return false; }
+    /*virtual*/ bool convertCoords(LLCoordScreen from, LLCoordGL *to) override { return false; }
+    /*virtual*/ bool convertCoords(LLCoordGL from, LLCoordScreen *to) override { return false; }
 
     /*virtual*/ LLWindowResolution* getSupportedResolutions(S32 &num_resolutions) override { return NULL; }
     /*virtual*/ F32 getNativeAspectRatio() override { return 1.0f; }
     /*virtual*/ F32 getPixelAspectRatio() override { return 1.0f; }
     /*virtual*/ void setNativeAspectRatio(F32 ratio) override {}
 
-    U32 getAvailableVRAMMegabytes() override { return 4096; }
-
     /*virtual*/ void *getPlatformWindow() override { return 0; }
     /*virtual*/ void bringToFront() override {}
 
@@ -110,8 +108,8 @@ public:
         const std::string& title, const std::string& name,
         S32 x, S32 y,
         S32 width, S32 height,
-        U32 flags,  BOOL fullscreen, BOOL clear_background,
-        BOOL enable_vsync, BOOL use_gl, BOOL ignore_pixel_depth);
+        U32 flags,  bool fullscreen, bool clear_background,
+        bool enable_vsync, bool use_gl, bool ignore_pixel_depth);
     virtual ~LLWindowHeadless();
 
 private: