1 files changed, 63 insertions, 58 deletions
diff --git a/indra/llwindow/llwindowmesaheadless.h b/indra/llwindow/llwindowmesaheadless.h
index 0bf8c46a30..47cd6320b1 100644
--- a/indra/llwindow/llwindowmesaheadless.h
+++ b/indra/llwindow/llwindowmesaheadless.h
@@ -30,70 +30,75 @@
 #if LL_MESA_HEADLESS
 
 #include "llwindow.h"
-#include "GL/glu.h"
 #include "GL/osmesa.h"
 
 class LLWindowMesaHeadless : public LLWindow
 {
 public:
-    /*virtual*/ void show() {};
-    /*virtual*/ void hide() {};
-    /*virtual*/ void close() {};
-    /*virtual*/ bool getVisible() {return false;};
-    /*virtual*/ bool getMinimized() {return false;};
-    /*virtual*/ bool getMaximized() {return false;};
-    /*virtual*/ bool maximize() {return false;};
-    /*virtual*/ void minimize() {};
-    /*virtual*/ void restore() {};
-    /*virtual*/ bool getFullscreen() {return false;};
-    /*virtual*/ bool getPosition(LLCoordScreen *position) {return false;};
-    /*virtual*/ bool getSize(LLCoordScreen *size) {return false;};
-    /*virtual*/ bool getSize(LLCoordWindow *size) {return false;};
-    /*virtual*/ bool setPosition(LLCoordScreen position) {return false;};
-    /*virtual*/ bool setSizeImpl(LLCoordScreen size) {return false;};
-    /*virtual*/ bool switchContext(bool fullscreen, const LLCoordScreen &size, bool disable_vsync, const LLCoordScreen * const posp = NULL) {return false;};
-    /*virtual*/ bool setCursorPosition(LLCoordWindow position) {return false;};
-    /*virtual*/ bool getCursorPosition(LLCoordWindow *position) {return false;};
-    /*virtual*/ void showCursor() {};
-    /*virtual*/ void hideCursor() {};
-    /*virtual*/ void showCursorFromMouseMove() {};
-    /*virtual*/ void hideCursorUntilMouseMove() {};
-    /*virtual*/ bool isCursorHidden() {return false;};
-    /*virtual*/ void updateCursor() {};
-    //virtual ECursorType getCursor() { return mCurrentCursor; };
-    /*virtual*/ void captureMouse() {};
-    /*virtual*/ void releaseMouse() {};
-    /*virtual*/ void setMouseClipping( bool b ) {};
-    /*virtual*/ bool isClipboardTextAvailable() {return false; };
-    /*virtual*/ bool pasteTextFromClipboard(LLWString &dst) {return false; };
-    /*virtual*/ bool copyTextToClipboard(const LLWString &src) {return false; };
-    /*virtual*/ void flashIcon(F32 seconds) {};
-    /*virtual*/ F32 getGamma() {return 1.0f; };
-    /*virtual*/ bool setGamma(const F32 gamma) {return false; }; // Set the gamma
-    /*virtual*/ bool restoreGamma() {return false; };   // Restore original gamma table (before updating gamma)
-    /*virtual*/ void setFSAASamples(const U32 fsaa_samples) { /* FSAA not supported yet on Mesa headless.*/ }
-    /*virtual*/ U32  getFSAASamples() { return 0; }
-    //virtual ESwapMethod getSwapMethod() { return mSwapMethod; }
-    /*virtual*/ void gatherInput() {};
-    /*virtual*/ void delayInputProcessing() {};
-    /*virtual*/ void swapBuffers();
-    /*virtual*/ void restoreGLContext() {};
+    void show() override {};
+    void hide() override {};
+    void close() override {};
+    bool getVisible() override {return false;};
+    bool getMinimized() override {return false;};
+    bool getMaximized() override {return false;};
+    bool maximize() override {return false;};
+    void minimize() override {};
+    void restore() override {};
+    bool getFullscreen() {return false;};
+    bool getPosition(LLCoordScreen *position) override {return false;};
+    bool getSize(LLCoordScreen *size) override {return false;};
+    bool getSize(LLCoordWindow *size) override {return false;};
+    bool setPosition(LLCoordScreen position) override {return false;};
+    bool setSizeImpl(LLCoordScreen size) override {return false;};
+    bool switchContext(bool fullscreen, const LLCoordScreen &size, bool disable_vsync, const LLCoordScreen * const posp = NULL) override {return false;};
+    bool setCursorPosition(LLCoordWindow position) override {return false;};
+    bool getCursorPosition(LLCoordWindow *position) override {return false;};
+    bool isWrapMouse() const override { return true; }
+    void showCursor() override {};
+    void hideCursor() override {};
+    void showCursorFromMouseMove() override {};
+    void hideCursorUntilMouseMove() override {};
+    bool isCursorHidden() override {return false;};
+    void updateCursor() override {};
+    //virtual ECursorType getCursor() override { return mCurrentCursor; };
+    void captureMouse() override {};
+    void releaseMouse() override {};
+    void setMouseClipping( bool b ) override {};
+    bool isClipboardTextAvailable() override {return false; };
+    bool pasteTextFromClipboard(LLWString &dst) override {return false; };
+    bool copyTextToClipboard(const LLWString &src) override {return false; };
+    void flashIcon(F32 seconds) override {};
+    F32 getGamma() override {return 1.0f; };
+    bool setGamma(const F32 gamma) override {return false; }; // Set the gamma
+    bool restoreGamma() override {return false; };   // Restore original gamma table (before updating gamma)
+    void setFSAASamples(const U32 fsaa_samples) override { /* FSAA not supported yet on Mesa headless.*/ }
+    U32  getFSAASamples() override { return 0; }
+    //virtual ESwapMethod getSwapMethod() override { return mSwapMethod; }
+    void gatherInput() override {};
+    void delayInputProcessing() override {};
+    void swapBuffers() override;
+
+    void* createSharedContext()override{return nullptr;};
+    void makeContextCurrent(void* context)override{};
+    void destroySharedContext(void* context)override{};
+    void toggleVSync(bool enable_vsync) override {};
+    bool setSizeImpl(LLCoordWindow size) override { return false; };
 
     // handy coordinate space conversion routines
-    /*virtual*/ bool convertCoords(LLCoordScreen from, LLCoordWindow *to) { return false; };
-    /*virtual*/ bool convertCoords(LLCoordWindow from, LLCoordScreen *to) { return false; };
-    /*virtual*/ bool convertCoords(LLCoordWindow from, LLCoordGL *to) { return false; };
-    /*virtual*/ bool convertCoords(LLCoordGL from, LLCoordWindow *to) { return false; };
-    /*virtual*/ bool convertCoords(LLCoordScreen from, LLCoordGL *to) { return false; };
-    /*virtual*/ bool convertCoords(LLCoordGL from, LLCoordScreen *to) { return false; };
+    bool convertCoords(LLCoordScreen from, LLCoordWindow *to) override { return false; };
+    bool convertCoords(LLCoordWindow from, LLCoordScreen *to) override { return false; };
+    bool convertCoords(LLCoordWindow from, LLCoordGL *to) override { return false; };
+    bool convertCoords(LLCoordGL from, LLCoordWindow *to) override { return false; };
+    bool convertCoords(LLCoordScreen from, LLCoordGL *to) override { return false; };
+    bool convertCoords(LLCoordGL from, LLCoordScreen *to) override { return false; };
 
-    /*virtual*/ LLWindowResolution* getSupportedResolutions(S32 &num_resolutions) { return NULL; };
-    /*virtual*/ F32 getNativeAspectRatio() { return 1.0f; };
-    /*virtual*/ F32 getPixelAspectRatio() { return 1.0f; };
-    /*virtual*/ void setNativeAspectRatio(F32 ratio) {}
+    LLWindowResolution* getSupportedResolutions(S32 &num_resolutions) override { return NULL; };
+    F32 getNativeAspectRatio() override { return 1.0f; };
+    F32 getPixelAspectRatio() override { return 1.0f; };
+    void setNativeAspectRatio(F32 ratio) override {}
 
-    /*virtual*/ void *getPlatformWindow() { return 0; };
-    /*virtual*/ void bringToFront() {};
+    void *getPlatformWindow() override { return 0; };
+    void bringToFront() override {};
 
     LLWindowMesaHeadless(LLWindowCallbacks* callbacks,
                          const std::string& title, const std::string& name, S32 x, S32 y, S32 width, S32 height,
@@ -112,9 +117,9 @@ public:
     LLSplashScreenMesaHeadless() {};
     virtual ~LLSplashScreenMesaHeadless() {};
 
-    /*virtual*/ void showImpl() {};
-    /*virtual*/ void updateImpl(const std::string& mesg) {};
-    /*virtual*/ void hideImpl() {};
+    void showImpl() override {};
+    void updateImpl(const std::string& mesg) override {};
+    void hideImpl() override {};
 
 };