From b4ac80203ba2cfb3020c2619609e6b0cc75fa0ad Mon Sep 17 00:00:00 2001
From: Nicky <sl.nicky.ml@googlemail.com>
Date: Mon, 26 May 2014 17:01:05 +0200
Subject: [PATCH] Only copy libllqtwebkit.dylib for i386 builds.

---
 indra/cmake/Copy3rdPartyLibs.cmake | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake
index 82fdfcade1..eb0ea92ff5 100755
--- a/indra/cmake/Copy3rdPartyLibs.cmake
+++ b/indra/cmake/Copy3rdPartyLibs.cmake
@@ -241,7 +241,7 @@ elseif(DARWIN)
         libexpat.1.5.2.dylib
         libexpat.dylib
         libGLOD.dylib
-        libllqtwebkit.dylib
+        #libllqtwebkit.dylib
         libminizip.a
         libndofdev.dylib
         libhunspell-1.3.0.dylib
@@ -251,6 +251,13 @@ elseif(DARWIN)
         libgrowl++.dylib
        )
 
+    # <FS:ND> libllqtwebkit.dylib comes from a prebuild slplugin. It needs to be fetched from somewhere else
+	# when building x64/universal. Probably it's best to copy it in fs_viewer_manifest.py for those cases.
+    if( NOT ND_BUILD64BIT_ARCH )
+      set(release_files ${release_files} libllqtwebkit.dylib )
+    endif( NOT ND_BUILD64BIT_ARCH )
+	# </FS:ND>
+
     # <FS:ND> We only ever need google breakpad when crash reporting is used
     if(RELEASE_CRASH_REPORTING OR NON_RELEASE_CRASH_REPORTING)
       set(release_files ${release_files} "libexception_handler.dylib")