From b24e5056e0256e7fc3cba4c8b405a9eebcaf82bf Mon Sep 17 00:00:00 2001
From: Nicky <none@none>
Date: Sat, 7 Jun 2014 00:50:16 +0200
Subject: [PATCH] Do not tweak LD_PRELOAD or LD_LIBRARY_PATH unless we have to.

---
 indra/newview/linux_tools/wrapper.sh | 3 +++
 indra/newview/viewer_manifest.py     | 1 +
 2 files changed, 4 insertions(+)

diff --git a/indra/newview/linux_tools/wrapper.sh b/indra/newview/linux_tools/wrapper.sh
index f8d3e58147..87ac97f096 100755
--- a/indra/newview/linux_tools/wrapper.sh
+++ b/indra/newview/linux_tools/wrapper.sh
@@ -125,6 +125,8 @@ export SAVED_LD_LIBRARY_PATH="${LD_LIBRARY_PATH}"
 #    fi
 #fi
 
+if ! test -f FS_No_LD_Hacks.txt; then
+
 export LD_LIBRARY_PATH="$PWD/lib:${LD_LIBRARY_PATH}"
 # AO: experimentally removing to allow --settings on the command line w/o error. FIRE-1031
 #export SL_OPT="`cat etc/gridargs.dat` $@"
@@ -142,6 +144,7 @@ then
 fi
 # <FS:ND> End of hack; God will kill a kitten for this :(
 
+fi
 
 # Copy "$@" to ARGS array specifically to delete the --skip-gridargs switch.
 # The gridargs.dat file is no more, but we still want to avoid breaking
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index f94324bed8..dd74a6f121 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -1400,6 +1400,7 @@ class Linux_i686_Manifest(LinuxManifest):
           except:
               print "Leap Motion library not found"
           self.end_prefix("lib")
+          open( os.path.join(self.get_dst_prefix(), "FS_No_LD_Hacks.txt" ), "w" ).write( "1" )
 
 
 class Linux_x86_64_Manifest(LinuxManifest):