Merge branch 'next' of git://github.com/ArminW/imprudence into next

Conflicts:
	linden/indra/newview/viewer_manifest.py
Conflicted with the OTR stuff, simple fix.

1 files changed, 0 insertions, 6 deletions

diff --git a/linden/indra/cmake/ViewerMiscLibs.cmake b/linden/indra/cmake/ViewerMiscLibs.cmake
index 38d0444..bf33490 100644
--- a/linden/indra/cmake/ViewerMiscLibs.cmake
+++ b/linden/indra/cmake/ViewerMiscLibs.cmake
@@ -5,18 +5,12 @@ if (NOT STANDALONE)
   use_prebuilt_binary(libuuid)
   use_prebuilt_binary(vivox)
   if(LINUX)
-    if (${ARCH} STREQUAL "x86_64")
-     use_prebuilt_binary(32bitcompatibilitylibs)
-        endif (${ARCH} STREQUAL "x86_64")
     use_prebuilt_binary(fontconfig)
   endif(LINUX)
 else (NOT STANDALONE)
   # Download there even when using standalone.
   set(STANDALONE OFF)
   use_prebuilt_binary(vivox)
-  if(LINUX AND ${ARCH} STREQUAL "x86_64")
-    use_prebuilt_binary(32bitcompatibilitylibs)
-  endif(LINUX AND ${ARCH} STREQUAL "x86_64")
   set(STANDALONE ON)
 endif(NOT STANDALONE)