Post merge cleanup of Linux code

4 files changed, 5 insertions, 33 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;
 };
diff --git a/indra/newview/lldirpicker.cpp b/indra/newview/lldirpicker.cpp
index 1425aab947..fa8acac2ce 100644
--- a/indra/newview/lldirpicker.cpp
+++ b/indra/newview/lldirpicker.cpp
@@ -272,6 +272,7 @@ bool LLDirPicker::getDir(std::string* filename, bool blocking)
     }
     return !mDir.empty();
 #endif
+    return false;
 }
 
 std::string LLDirPicker::getDirName()
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index e9112694d9..c778f1e838 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -1803,34 +1803,6 @@ class Linux_x86_64_Manifest(LinuxManifest):
             self.path("libalut.so*")
             self.path("libopenal.so*")
             self.path("libopenal.so", "libvivoxoal.so.1") # vivox's sdk expects this soname
-            # KLUDGE: As of 2012-04-11, the 'fontconfig' package installs
-            # libfontconfig.so.1.4.4, along with symlinks libfontconfig.so.1
-            # and libfontconfig.so. Before we added support for library-file
-            # wildcards, though, this self.path() call specifically named
-            # libfontconfig.so.1.4.4 WITHOUT also copying the symlinks. When I
-            # (nat) changed the call to self.path("libfontconfig.so.*"), we
-            # ended up with the libfontconfig.so.1 symlink in the target
-            # directory as well. But guess what! At least on Ubuntu 10.04,
-            # certain viewer fonts look terrible with libfontconfig.so.1
-            # present in the target directory. Removing that symlink suffices
-            # to improve them. I suspect that means we actually do better when
-            # the viewer fails to find our packaged libfontconfig.so*, falling
-            # back on the system one instead -- but diagnosing and fixing that
-            # is a bit out of scope for the present project. Meanwhile, this
-            # particular wildcard specification gets us exactly what the
-            # previous call did, without having to explicitly state the
-            # version number.
-            self.path("libfontconfig.so.*.*")
-
-            # Include libfreetype.so. but have it work as libfontconfig does.
-            self.path("libfreetype.so.*.*")
-
-            try:
-                self.path("libtcmalloc.so*") #formerly called google perf tools
-                pass
-            except:
-                print("tcmalloc files not found, skipping")
-                pass
 
         # Vivox runtimes
         with self.prefix(src=relpkgdir, dst="bin"):