diff --git a/autobuild.xml b/autobuild.xml
index da32eabea7..dff36f87d4 100755
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -37,18 +37,6 @@
name
linux
- linux64
-
windows
archive
@@ -129,18 +117,6 @@
name
linux
- linux64
-
- archive
-
- hash
- 4551308262b8d24f6d8dab7d8d690d5d
- url
- http://downloads.firestormviewer.org/installables/SDL-1.2.14-linux-x64-20131228.tar.bz2
-
- name
- linux64
-
apr_suite
@@ -177,18 +153,6 @@
name
linux
- linux64
-
- archive
-
- hash
- c0a3ca6e3f17329f698a097991788a3e
- url
- http://downloads.phoenixviewer.com/apr_suite-1.4.5.201502072210-linux-x64-201502072210.tar.bz2
-
- name
- linux64
-
windows
archive
@@ -237,18 +201,6 @@
name
linux
- linux64
-
- archive
-
- hash
- 691aa373708bdf72b1153893f7578dd8
- url
- http://downloads.firestormviewer.org/installables/ares-1.10.0-linux-x64-20131212.tar.bz2
-
- name
- linux64
-
windows
archive
@@ -297,18 +249,6 @@
name
linux
- linux64
-
- archive
-
- hash
- 01a37a2400190d73638ec404d3aef065
- url
- http://downloads.firestormviewer.org/installables/boost-1.52.0-linux-x64-20131214.tar.bz2
-
- name
- linux64
-
windows
archive
@@ -357,18 +297,6 @@
name
linux
- linux64
-
- archive
-
- hash
- 7553b62c7ca7df04fa25fb70430c79d6
- url
- http://downloads.firestormviewer.org/installables/colladadom-2.2-linux-x64-20131215.tar.bz2
-
- name
- linux64
-
windows
archive
@@ -417,18 +345,6 @@
name
linux
- linux64
-
- archive
-
- hash
- 8d69881b9172c0e0a431f0f0dfa99e8f
- url
- http://downloads.phoenixviewer.com/curl-7.38.0.0-linux-x64-20150124.tar.bz2
-
- name
- linux64
-
windows
archive
@@ -465,18 +381,6 @@
name
linux
- linux64
-
- archive
-
- hash
- 02cf031da2eaa733d4458840e9513e88
- url
- http://downloads.firestormviewer.org/installables/dbus_glib-0.76-linux-x64-20131215.tar.bz2
-
- name
- linux64
-
dictionaries
@@ -513,18 +417,6 @@
name
linux
- linux64
-
- archive
-
- hash
- d1fcbdd80e8748455ba528cbf0514801
- url
- http://downloads.firestormviewer.org/installables/dictionaries-1-linux-x64-20131215.tar.bz2
-
- name
- linux64
-
windows
archive
@@ -573,18 +465,6 @@
name
linux
- linux64
-
- archive
-
- hash
- 1180518fc763d6dafeaeb271f7fac79c
- url
- http://downloads.phoenixviewer.com/expat-2.0.1.201502072206-linux-x64-201502072206.tar.bz2
-
- name
- linux64
-
windows
archive
@@ -633,18 +513,6 @@
name
linux
- linux64
-
- archive
-
- hash
- 93d450e246e7aeb7ba25d93adc3ebc9d
- url
- file:///opt/firestorm/fmodex-4.44.41-linux-20140819.tar.bz2
-
- name
- linux64
-
windows
archive
@@ -681,18 +549,6 @@
name
linux
- linux64
-
- archive
-
- hash
- cde73209ae2a74d1fa2dcc4b70db6e67
- url
- http://downloads.firestormviewer.org/installables/fontconfig-2.8.0-linux-x64-20131216.tar.bz2
-
- name
- linux64
-
freeglut
@@ -753,18 +609,6 @@
name
linux
- linux64
-
- archive
-
- hash
- 6f59fd0dc976a12f3053d0ea8371438e
- url
- http://downloads.firestormviewer.org/installables/freetype-2.4.11-linux-x64-20131215.tar.bz2
-
- name
- linux64
-
windows
archive
@@ -801,18 +645,6 @@
name
linux
- linux64
-
- archive
-
- hash
- ea2524f19d53c12645413543930731b0
- url
- http://downloads.firestormviewer.org/installables/glext-68-linux-x64-20131215.tar.bz2
-
- name
- linux64
-
windows
archive
@@ -861,18 +693,6 @@
name
linux
- linux64
-
- archive
-
- hash
- 31211ab614a1b8f634615194ab7f2360
- url
- http://downloads.firestormviewer.org/installables/glh_linear-0.0.0-linux-x64-20131213.tar.bz2
-
- name
- linux64
-
windows
archive
@@ -945,18 +765,6 @@
name
linux
- linux64
-
- archive
-
- hash
- 8aae0c236af596e794fe009f344b3d3b
- url
- http://downloads.firestormviewer.org/installables/gmock-1.6.0-linux-x64-20131215.tar.bz2
-
- name
- linux64
-
windows
archive
@@ -1005,18 +813,6 @@
name
linux
- linux64
-
- archive
-
- hash
- b497e91203227c236f291c8cc83a5076
- url
- http://downloads.firestormviewer.org/installables/google_breakpad-0.0.0-rev1099-linux-x64-20131212.tar.bz2
-
- name
- linux64
-
windows
archive
@@ -1053,18 +849,6 @@
name
linux
- linux64
-
- archive
-
- hash
- cac55fe6c0069fd8209ab48a6c8372c2
- url
- http://downloads.firestormviewer.org/installables/gperftools-2.0-linux-x64-20131215.tar.bz2
-
- name
- linux64
-
windows
archive
@@ -1101,18 +885,6 @@
name
linux
- linux64
-
- archive
-
- hash
- 9ffe8e4a52f425fc951200e8689b5cdf
- url
- http://downloads.firestormviewer.org/installables/gstreamer-0.10.28-linux-x64-20131223.tar.bz2
-
- name
- linux64
-
gtk-atk-pango-glib
@@ -1137,18 +909,6 @@
name
linux
- linux64
-
- archive
-
- hash
- 0c5990879c99cb5aad9c89862c8c2203
- url
- http://downloads.firestormviewer.org/installables/gtk-atk-pango-glib-linux-x64-20131223.tar.bz2
-
- name
- linux64
-
windows
archive
@@ -1245,18 +1005,6 @@
name
linux
- linux64
-
- archive
-
- hash
- cbf3fde6c5a9567813c591d399e69f11
- url
- http://downloads.firestormviewer.org/installables/jpeglib-8c-linux-x64-20131212.tar.bz2
-
- name
- linux64
-
windows
archive
@@ -1305,18 +1053,6 @@
name
linux
- linux64
-
- archive
-
- hash
- 4e56cf7e6dafcd124c09d70c7ab47cd2
- url
- http://downloads.firestormviewer.org/installables/jsoncpp-0.5.0-linux-x64-20131212.tar.bz2
-
- name
- linux64
-
windows
archive
@@ -1365,18 +1101,6 @@
name
linux
- linux64
-
- archive
-
- hash
- 1310525b07b37fb6c869ba1af24425ce
- url
- file:///opt/firestorm/kdu-7.5.0-linux-20141007.tar.bz2
-
- name
- linux64
-
windows
archive
@@ -1473,18 +1197,6 @@
name
linux
- linux64
-
- archive
-
- hash
- 0b4442ab57af206253c47876a0220c63
- url
- http://downloads.firestormviewer.org/installables/libhunspell-1.3.2-linux-x64-20131212.tar.bz2
-
- name
- linux64
-
windows
archive
@@ -1521,18 +1233,6 @@
name
darwin
- linux64
-
- archive
-
- hash
- 9a915137a95612c1570f4a0c901755fa
- url
- http://downloads.phoenixviewer.com/libidn-1.28-linux-x64-20150125.tar.bz2
-
- name
- linux64
-
libpng
@@ -1569,18 +1269,6 @@
name
linux
- linux64
-
- archive
-
- hash
- bac1f696d942610da5c8d371f1c51703
- url
- http://downloads.firestormviewer.org/installables/libpng-1.5.1-linux-x64-20131220.tar.bz2
-
- name
- linux64
-
windows
archive
@@ -1617,18 +1305,6 @@
name
linux
- linux64
-
- archive
-
- hash
- 4729178d1d0bdc9c7d1d1c66712e9646
- url
- http://downloads.firestormviewer.org/installables/uuid-1.6.2-linux-x64-20131215.tar.bz2
-
- name
- linux64
-
libxml2
@@ -1653,18 +1329,6 @@
name
linux
- linux64
-
- archive
-
- hash
- 819bf22602afa1fbbfef3bb067d21069
- url
- http://downloads.firestormviewer.org/installables/libxml2-2.7.8-linux-x64-20131212.tar.bz2
-
- name
- linux64
-
llappearanceutility-source
@@ -1831,18 +1495,6 @@
name
linux
- linux64
-
- archive
-
- hash
- 481c0e78eee98200b31bce52d00e4fea
- url
- http://downloads.phoenixviewer.com/llqtwebkit-4.7.1-linux-x64-201502081629.tar.bz2
-
- name
- linux64
-
windows
archive
@@ -1915,18 +1567,6 @@
name
linux
- linux64
-
- archive
-
- hash
- 351ebe8e638cea6f6c3dd85dd0b5b00c
- url
- http://downloads.firestormviewer.org/installables/ndPhysicsStub-1.0-linux-x64-20131215.tar.bz2
-
- name
- linux64
-
windows
archive
@@ -1975,18 +1615,6 @@
name
linux
- linux64
-
- archive
-
- hash
- 016f6f2fa3dcc616f67749f2bf0ef201
- url
- http://downloads.firestormviewer.org/installables/libndofdev-0.3-linux-x64-20131212.tar.bz2
-
- name
- linux64
-
windows
archive
@@ -2059,18 +1687,6 @@
name
linux
- linux64
-
- archive
-
- hash
- 7af891ac1fb52d0c43b0a466d1d2b2d5
- url
- http://downloads.firestormviewer.org/installables/ogg_vorbis-1.2.2-1.3.2-linux-x64-20131212.tar.bz2
-
- name
- linux64
-
windows
archive
@@ -2109,18 +1725,6 @@
name
linux
- linux64
-
- archive
-
- hash
- bcb331520266fbb2b581aaf7d0d8e9fa
- url
- http://downloads.firestormviewer.org/installables/openal-1.12.854-1.1.0-linux-x64-20131215.tar.bz2
-
- name
- linux64
-
windows
archive
@@ -2171,18 +1775,6 @@
name
linux
- linux64
-
- archive
-
- hash
- 6ac7d355ad071e9dca55b403397c3ff9
- url
- http://downloads.firestormviewer.org/installables/openjpeg-1.4-linux-x64-20131212.tar.bz2
-
- name
- linux64
-
windows
archive
@@ -2231,18 +1823,6 @@
name
linux
- linux64
-
- archive
-
- hash
- 0b26c12dd20aa928453ee18f4793a2dd
- url
- http://downloads.firestormviewer.org/installables/openssl-1.0.1g-linux-x64-20140417.tar.bz2
-
- name
- linux64
-
windows
archive
@@ -2291,18 +1871,6 @@
name
linux
- linux64
-
- archive
-
- hash
- c31f766db43797f9e95995819ebc36e6
- url
- http://downloads.firestormviewer.org/installables/pcre-8.32-linux-x64-20131212.tar.bz2
-
- name
- linux64
-
windows
archive
@@ -2407,18 +1975,6 @@
name
linux
- linux64
-
- archive
-
- hash
- 0f63c311c77c7f0a61a6a5b85639661b
- url
- http://downloads.phoenixviewer.com/slvoice-4.5.0009.17865-linux-20150214.tar.bz2
-
- name
- linux64
-
windows
archive
@@ -2455,18 +2011,6 @@
name
common
- linux64
-
- archive
-
- hash
- 130be9c2677de96b1013cde9b0920b06
- url
- http://downloads.firestormviewer.org/installables/tut-2008-11-30-linux-x64-20131212.tar.bz2
-
- name
- linux64
-
uriparser
@@ -2503,18 +2047,6 @@
name
linux
- linux64
-
- archive
-
- hash
- e67a27e13e546cbb13fad2665a1896b7
- url
- http://downloads.phoenixviewer.com/uriparser-0.8.0.1-linux-x64-201502251606-r15.tar.bz2
-
- name
- linux64
-
windows
archive
@@ -2583,18 +2115,6 @@
name
linux
- linux64
-
- archive
-
- hash
- 7c5937ee2795f27a27dba687cc9305ee
- url
- http://downloads.firestormviewer.org/installables/xmlrpc_epi-0.54.1-linux-x64-20131212.tar.bz2
-
- name
- linux64
-
windows
archive
@@ -2643,18 +2163,6 @@
name
linux
- linux64
-
- archive
-
- hash
- 1aeacb726e534edc9c94bfcb71ec4af8
- url
- http://downloads.phoenixviewer.com/zlib-1.2.8.201502072231-linux-x64-201502072231.tar.bz2
-
- name
- linux64
-
windows
archive
diff --git a/indra/cmake/Prebuilt.cmake b/indra/cmake/Prebuilt.cmake
index 568ee8b12a..f5e03aea59 100755
--- a/indra/cmake/Prebuilt.cmake
+++ b/indra/cmake/Prebuilt.cmake
@@ -30,17 +30,6 @@ macro (use_prebuilt_binary _binary)
endif("${${_binary}_installed}" STREQUAL "" AND EXISTS "${CMAKE_BINARY_DIR}/temp/${_binary}_installed")
if(${CMAKE_BINARY_DIR}/temp/sentinel_installed IS_NEWER_THAN ${CMAKE_BINARY_DIR}/temp/${_binary}_installed OR NOT ${${_binary}_installed} EQUAL 0)
- if (ND_BUILD64BIT_ARCH)
- if (LINUX)
- set(autobuild_install_platform "--platform=linux64")
- endif (LINUX)
- if (DARWIN)
- set(autobuild_install_platform "")
- endif (DARWIN)
- if (WINDOWS)
- set(autobuild_install_platform "")
- endif (WINDOWS)
- endif (ND_BUILD64BIT_ARCH)
if(DEBUG_PREBUILT)
message("cd ${CMAKE_SOURCE_DIR} && ${AUTOBUILD_EXECUTABLE} install ${autobuild_install_platform}
--install-dir=${AUTOBUILD_INSTALL_DIR}