merge changes for DRTVWR-294

ddd5659f · Oz Linden · ed2b5da8 · be1bb8d7 · ddd5659f · ddd5659f
Commit ddd5659f authored 12 years ago by Oz Linden
--- a/indra/cmake/CMakeLists.txt
+++ b/indra/cmake/CMakeLists.txt
--- a/indra/cmake/CURL.cmake
+++ b/indra/cmake/CURL.cmake
--- a/indra/cmake/Copy3rdPartyLibs.cmake
+++ b/indra/cmake/Copy3rdPartyLibs.cmake
@@ -261,7 +261,6 @@ elseif(LINUX)
        libboost_filesystem-mt.so.${BOOST_VERSION}.0
        libboost_signals-mt.so.${BOOST_VERSION}.0
        libboost_system-mt.so.${BOOST_VERSION}.0
-        libbreakpad_client.so.0
        libcollada14dom.so
        libcrypto.so.1.0.0
        libdb-5.1.so

--- a/indra/cmake/DBusGlib.cmake
+++ b/indra/cmake/DBusGlib.cmake
--- a/indra/cmake/DeploySharedLibs.cmake
+++ b/indra/cmake/DeploySharedLibs.cmake
--- a/indra/cmake/DirectX.cmake
+++ b/indra/cmake/DirectX.cmake
--- a/indra/cmake/DragDrop.cmake
+++ b/indra/cmake/DragDrop.cmake
--- a/indra/cmake/EXPAT.cmake
+++ b/indra/cmake/EXPAT.cmake
--- a/indra/cmake/ExamplePlugin.cmake
+++ b/indra/cmake/ExamplePlugin.cmake
--- a/indra/cmake/FindAPR.cmake
+++ b/indra/cmake/FindAPR.cmake
--- a/indra/cmake/FindAutobuild.cmake
+++ b/indra/cmake/FindAutobuild.cmake
--- a/indra/cmake/FindBerkeleyDB.cmake
+++ b/indra/cmake/FindBerkeleyDB.cmake
--- a/indra/cmake/FindCARes.cmake
+++ b/indra/cmake/FindCARes.cmake
--- a/indra/cmake/FindGLH.cmake
+++ b/indra/cmake/FindGLH.cmake
--- a/indra/cmake/FindGoogleBreakpad.cmake
+++ b/indra/cmake/FindGoogleBreakpad.cmake
--- a/indra/cmake/FindGooglePerfTools.cmake
+++ b/indra/cmake/FindGooglePerfTools.cmake
--- a/indra/cmake/FindHUNSPELL.cmake
+++ b/indra/cmake/FindHUNSPELL.cmake
--- a/indra/cmake/FindJsonCpp.cmake
+++ b/indra/cmake/FindJsonCpp.cmake
--- a/indra/cmake/FindNDOF.cmake
+++ b/indra/cmake/FindNDOF.cmake
--- a/indra/cmake/FindOpenJPEG.cmake
+++ b/indra/cmake/FindOpenJPEG.cmake