2 files changed, 4 insertions, 5 deletions
diff --git a/indra/llwindow/llwindowsdl.cpp b/indra/llwindow/llwindowsdl.cpp
index f667ff7542..079fca00c0 100644
--- a/indra/llwindow/llwindowsdl.cpp
+++ b/indra/llwindow/llwindowsdl.cpp
@@ -427,7 +427,7 @@ LLWindowSDL::LLWindowSDL(LLWindowCallbacks* callbacks,
 
 #if LL_X11
     mSDL_XWindowID = None;
-    mSDL_Display = NULL;
+    mSDL_Display = nullptr;
 #endif // LL_X11
 
     // Assume 4:3 aspect ratio until we know better
diff --git a/indra/llwindow/llwindowsdl.h b/indra/llwindow/llwindowsdl.h
index 3ed2811572..3acda71157 100644
--- a/indra/llwindow/llwindowsdl.h
+++ b/indra/llwindow/llwindowsdl.h
@@ -285,7 +285,6 @@ protected:
 
     int mHaveInputFocus; /* 0=no, 1=yes, else unknown */
     int mIsMinimized; /* 0=no, 1=yes, else unknown */
-    int mIsActive; /* 0=no, 1=yes, else unknown */
 
     friend class LLWindowManager;
 
@@ -316,6 +315,8 @@ public:
     void clearSecondaryText() { mSecondaryClipboard.clear(); }
 
 private:
+    void tryFindFullscreenSize(int &aWidth, int &aHeight);
+
     void initialiseX11Clipboard();
 
     bool getSelectionText(Atom selection, LLWString &text);
@@ -323,10 +324,8 @@ private:
     bool getSelectionText(Atom selection, Atom type, LLWString &text);
 
     bool setSelectionText(Atom selection, const LLWString &text);
-#endif
-
-    void tryFindFullscreenSize(int &aWidth, int &aHeight);
 
+#endif
     LLWString mPrimaryClipboard;
     LLWString mSecondaryClipboard;
 };