From ef07674b553be1f970df8efad763315ea405261f Mon Sep 17 00:00:00 2001 From: Roxie Linden Date: Thu, 29 Apr 2010 02:07:46 -0700 Subject: Use openssl 0.9.8l for mac --- install.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'install.xml') diff --git a/install.xml b/install.xml index 651a6b9cf9..0c2fc60d3a 100644 --- a/install.xml +++ b/install.xml @@ -1112,9 +1112,9 @@ anguage Infrstructure (CLI) international standard darwin md5sum - a7b49e0f3eedbd5de117a3524c414b3a + 11d2be4f2b172430747b7d4a6739e3d8 url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/openSSL-0.9.7c-darwin-20080812.tar.bz2 + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/openSSL-0.9.8l-darwin-20100428.tar.bz2 linux -- cgit v1.3 From 196420259fe0001749de0efcbccb184c1e8fb47c Mon Sep 17 00:00:00 2001 From: brad kittenbrink Date: Tue, 18 May 2010 11:55:00 -0700 Subject: VPLAT-237: Added windows and mac build of google_breakpad. A new library package for crash reporting. --- install.xml | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) (limited to 'install.xml') diff --git a/install.xml b/install.xml index 0c2fc60d3a..1ac6f7d918 100644 --- a/install.xml +++ b/install.xml @@ -583,6 +583,32 @@ + google_breakpad + + copyright + Copyright (c) 2006, Google Inc. + description + An open-source multi-platform crash reporting system + license + bsd + packages + + darwin + + md5sum + 34bb9d8dd8247fdbe238cf96813f333b + url + http://viewer-source-downloads.s3.amazonaws.com/install_pkgs/google_breakpad-0.0.0-rev599-darwin-20100517.tar.bz2 + + windows + + md5sum + 0dc3f96299a182cad538ff134547a2e3 + url + http://viewer-source-downloads.s3.amazonaws.com/install_pkgs/google_breakpad-0.0.0-rev599-windows-20100518.tar.bz2 + + + googlemock copyright @@ -950,7 +976,7 @@ anguage Infrstructure (CLI) international standard md5sum 1956228a93537f250b92f2929fa4ea40 url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/llqtwebkit-4.6+cookies-darwin-20100415.tar.bz2 + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/llqtwebkit-4.6+cookies-darwin-20100415.tar.bz2 linux -- cgit v1.3 From e4efbc69ed013294f930fc2fd16ba8f863a18e2d Mon Sep 17 00:00:00 2001 From: Roxie Linden Date: Wed, 19 May 2010 17:09:54 -0700 Subject: EXT-7410 Update Vivox SDK to 3.1.0001.8744 --- install.xml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'install.xml') diff --git a/install.xml b/install.xml index 0c2fc60d3a..12bd7e625b 100644 --- a/install.xml +++ b/install.xml @@ -950,7 +950,7 @@ anguage Infrstructure (CLI) international standard md5sum 1956228a93537f250b92f2929fa4ea40 url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/llqtwebkit-4.6+cookies-darwin-20100415.tar.bz2 + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/llqtwebkit-4.6+cookies-darwin-20100415.tar.bz2 linux @@ -1386,23 +1386,23 @@ anguage Infrstructure (CLI) international standard darwin md5sum - 3b7fa3a7ac07034a747759f22956b6d5 + 4d29351a842fafe617de65a8183da160 url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/vivox-3.1.0001.8385-darwin-20100412.tar.bz2 + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/vivox-3.1.0001.8744-darwin-20100519.tar.bz2 linux md5sum - 3f834e00fa06e636814f22ad8685e407 + 7541138c439b1c0312610d18968f27d2 url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/vivox-3.1.0001.8385-linux-20100412.tar.bz2 + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/vivox-3.1.0001.8744-linux-20100519.tar.bz2 windows md5sum - 089a715a33cb48e030c9206966dfe31b + 5d2b049ca5239da2dcebde91f7f25a43 url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/vivox-3.1.0001.8385-windows-20100412.tar.bz2 + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/vivox-3.1.0001.8744-windows-20100519.tar.bz2 -- cgit v1.3 From f6fc09e4fa1d3c6e54f639ae139603a7962c3684 Mon Sep 17 00:00:00 2001 From: Monroe Linden Date: Wed, 19 May 2010 17:26:25 -0700 Subject: Updated Mac build of llqtwebkit, adding some support we'll need to fix EXT-5667 (support window.open() in shared media so google docs will work). revision aacdf69cbf5aa12d77c179296e31ef643ed1ef4a in http://qt.gitorious.org/+lindenqt/qt/lindenqt (currently head of the 'lindenqt' branch) revision e2eaaf8b3e96 in http://bitbucket.org/lindenlab/llqtwebkit/ (currently head of the default branch) --- install.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'install.xml') diff --git a/install.xml b/install.xml index 0c2fc60d3a..07a2a6b58d 100644 --- a/install.xml +++ b/install.xml @@ -948,9 +948,9 @@ anguage Infrstructure (CLI) international standard darwin md5sum - 1956228a93537f250b92f2929fa4ea40 + 1417e04ca4bec1ed281c43d37b613845 url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/llqtwebkit-4.6+cookies-darwin-20100415.tar.bz2 + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/llqtwebkit-4.6+cookies-darwin-20100519.tar.bz2 linux -- cgit v1.3 From 42796c938ba713b8f3aaff1b5d43d54021e223b8 Mon Sep 17 00:00:00 2001 From: Monroe Linden Date: Wed, 19 May 2010 17:35:19 -0700 Subject: Updated Windows build of llqtwebkit, adding some support we'll need to fix EXT-5667 (support window.open() in shared media so google docs will work). revision aacdf69cbf5aa12d77c179296e31ef643ed1ef4a in http://qt.gitorious.org/+lindenqt/qt/lindenqt (currently head of the 'lindenqt' branch) revision ff8a72a3078b in http://bitbucket.org/lindenlab/llqtwebkit/ (currently head of the default branch) --- install.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'install.xml') diff --git a/install.xml b/install.xml index 07a2a6b58d..40c58efc47 100644 --- a/install.xml +++ b/install.xml @@ -962,9 +962,9 @@ anguage Infrstructure (CLI) international standard windows md5sum - b873755dff5f4221b5a3ba63129435a7 + d682ed6232193b4eab3170657a54ebf9 url - http://viewer-source-downloads.s3.amazonaws.com/install_pkgs/llqtwebkit-windows-qt4.6-cookies-20100402.tar.bz2 + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/llqtwebkit-windows-qt4.6-20100519.tar.bz2 -- cgit v1.3 From 0e545644e10d82b8acde37db63e4ba946f241b4a Mon Sep 17 00:00:00 2001 From: Tofu Linden Date: Fri, 21 May 2010 13:06:53 +0100 Subject: Updated Linux build of llqtwebkit, adding some support we'll need to fix EXT-5667 (support window.open() in shared media so google docs will work). --- install.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'install.xml') diff --git a/install.xml b/install.xml index 0e54c73c93..bb2f8c1f2f 100644 --- a/install.xml +++ b/install.xml @@ -955,9 +955,9 @@ anguage Infrstructure (CLI) international standard linux md5sum - a90135a68d2821eef742d15cb06b15b9 + 7a5e02d252b76ab41bdca58506fa4147 url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/llqtwebkit-linux-20100407-cookie-api.tar.bz2 + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/llqtwebkit-linux-20100521.tar.bz2 windows -- cgit v1.3 From 719edddf0498752a0295502d62710823d1a72cc7 Mon Sep 17 00:00:00 2001 From: "Andrew A. de Laix" Date: Fri, 21 May 2010 09:38:29 -0700 Subject: Switch Darwin to use breakpad minidump rather than os generated crash stack. --- indra/llcommon/CMakeLists.txt | 1 + indra/llcommon/llapp.cpp | 51 ++++++++++++++++++++++++++++++++++- indra/llcommon/llapp.h | 11 ++++++-- indra/llcrashlogger/llcrashlogger.cpp | 21 +++++++++++++++ indra/newview/llappviewer.cpp | 2 ++ install.xml | 11 ++++++-- 6 files changed, 92 insertions(+), 5 deletions(-) (limited to 'install.xml') diff --git a/indra/llcommon/CMakeLists.txt b/indra/llcommon/CMakeLists.txt index 3c689930b8..051e198e75 100644 --- a/indra/llcommon/CMakeLists.txt +++ b/indra/llcommon/CMakeLists.txt @@ -259,6 +259,7 @@ endif(LLCOMMON_LINK_SHARED) target_link_libraries( llcommon + exception_handler ${APRUTIL_LIBRARIES} ${APR_LIBRARIES} ${EXPAT_LIBRARIES} diff --git a/indra/llcommon/llapp.cpp b/indra/llcommon/llapp.cpp index 6b2d1b7c20..e766563c6f 100644 --- a/indra/llcommon/llapp.cpp +++ b/indra/llcommon/llapp.cpp @@ -56,6 +56,11 @@ BOOL ConsoleCtrlHandler(DWORD fdwCtrlType); # include // for fork() void setup_signals(); void default_unix_signal_handler(int signum, siginfo_t *info, void *); + +// Called by breakpad exception handler after the minidump has been generated. +bool darwin_post_minidump_callback(const char *dump_dir, + const char *minidump_id, + void *context, bool succeeded); # if LL_DARWIN /* OSX doesn't support SIGRT* */ S32 LL_SMACKDOWN_SIGNAL = SIGUSR1; @@ -123,7 +128,10 @@ void LLApp::commonCtor() // Set the application to this instance. sApplication = this; - + + mExceptionHandler = 0; + + memset(minidump_path, 0, MAX_MINDUMP_PATH_LENGTH); } LLApp::LLApp(LLErrorThread *error_thread) : @@ -152,6 +160,8 @@ LLApp::~LLApp() delete mThreadErrorp; mThreadErrorp = NULL; } + + if(mExceptionHandler != 0) delete mExceptionHandler; LLCommon::cleanupClass(); } @@ -285,6 +295,15 @@ void LLApp::setupErrorHandling() setup_signals(); + +#ifdef LL_DARWIN + // Add google breakpad exception handler configured for Darwin. + if(mExceptionHandler == 0) + { + std::string dumpPath = "/tmp/"; + mExceptionHandler = new google_breakpad::ExceptionHandler(dumpPath, 0, &darwin_post_minidump_callback, 0, true); + } +#endif #endif startErrorThread(); @@ -587,6 +606,7 @@ void setup_signals() // Asynchronous signals that result in core sigaction(SIGQUIT, &act, NULL); + } void clear_signals() @@ -766,3 +786,32 @@ void default_unix_signal_handler(int signum, siginfo_t *info, void *) } #endif // !WINDOWS + +bool darwin_post_minidump_callback(const char *dump_dir, + const char *minidump_id, + void *context, bool succeeded) +{ + // Copy minidump file path into fixed buffer in the app instance to avoid + // heap allocations in a crash handler. + + // path format: /.dmp + int dirPathLength = strlen(dump_dir); + int idLength = strlen(minidump_id); + + // The path must not be truncated. + llassert((dirPathLength + idLength + 5) <= LLApp::MAX_MINDUMP_PATH_LENGTH); + + char * path = LLApp::instance()->minidump_path; + S32 remaining = LLApp::MAX_MINDUMP_PATH_LENGTH; + strncpy(path, dump_dir, remaining); + remaining -= dirPathLength; + path += dirPathLength; + strncpy(path, minidump_id, remaining); + remaining -= idLength; + path += idLength; + strncpy(path, ".dmp", remaining); + + llinfos << "generated minidump: " << LLApp::instance()->minidump_path << llendl; + LLApp::runErrorHandler(); + return true; +} diff --git a/indra/llcommon/llapp.h b/indra/llcommon/llapp.h index e5b8edf9c3..cd17532203 100644 --- a/indra/llcommon/llapp.h +++ b/indra/llcommon/llapp.h @@ -38,6 +38,8 @@ #include "llsd.h" #include "lloptioninterface.h" +#include "exception_handler.h" + // Forward declarations template class LLAtomic32; typedef LLAtomic32 LLAtomicU32; @@ -228,6 +230,8 @@ public: void setErrorHandler(LLAppErrorHandler handler); void setSyncErrorHandler(LLAppErrorHandler handler); + static void runErrorHandler(); // run shortly after we detect an error, ran in the relatively robust context of the LLErrorThread - preferred. + static void runSyncErrorHandler(); // run IMMEDIATELY when we get an error, ran in the context of the faulting thread. //@} #if !LL_WINDOWS @@ -265,6 +269,9 @@ public: typedef std::map string_map; string_map mOptionMap; // Contains all command-line options and arguments in a map + // Contains the path to minidump file after a crash. + static const U32 MAX_MINDUMP_PATH_LENGTH = 256; + char minidump_path[MAX_MINDUMP_PATH_LENGTH]; protected: static void setStatus(EAppStatus status); // Use this to change the application status. @@ -286,8 +293,6 @@ protected: private: void startErrorThread(); - static void runErrorHandler(); // run shortly after we detect an error, ran in the relatively robust context of the LLErrorThread - preferred. - static void runSyncErrorHandler(); // run IMMEDIATELY when we get an error, ran in the context of the faulting thread. // *NOTE: On Windows, we need a routine to reset the structured // exception handler when some evil driver has taken it over for @@ -315,6 +320,8 @@ private: private: // the static application instance if it was created. static LLApp* sApplication; + + google_breakpad::ExceptionHandler * mExceptionHandler; #if !LL_WINDOWS diff --git a/indra/llcrashlogger/llcrashlogger.cpp b/indra/llcrashlogger/llcrashlogger.cpp index c1022c1195..8f5aa5ab2d 100755 --- a/indra/llcrashlogger/llcrashlogger.cpp +++ b/indra/llcrashlogger/llcrashlogger.cpp @@ -274,6 +274,27 @@ void LLCrashLogger::gatherFiles() mCrashInfo[(*itr).first] = rawstr_to_utf8(crash_info); } + + // Add minidump as binary. + std::string minidump_path = mDebugLog["MinidumpPath"]; + if(minidump_path != "") + { + std::ifstream minidump_stream(minidump_path.c_str(), std::ios_base::in | std::ios_base::binary); + if(minidump_stream.is_open()) + { + minidump_stream.seekg(0, std::ios::end); + size_t length = minidump_stream.tellg(); + minidump_stream.seekg(0, std::ios::beg); + + LLSD::Binary data; + data.resize(length); + + minidump_stream.read(reinterpret_cast(&(data[0])),length); + minidump_stream.close(); + + mCrashInfo["Minidump"] = data; + } + } } LLSD LLCrashLogger::constructPostData() diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index f7f7cb599e..56486c788b 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -2587,6 +2587,8 @@ void LLAppViewer::handleViewerCrash() gDebugInfo["FirstLogin"] = (LLSD::Boolean) gAgent.isFirstLogin(); gDebugInfo["FirstRunThisInstall"] = gSavedSettings.getBOOL("FirstRunThisInstall"); + if(pApp->minidump_path[0] != 0) gDebugInfo["MinidumpPath"] = pApp->minidump_path; + if(gLogoutInProgress) { gDebugInfo["LastExecEvent"] = LAST_EXEC_LOGOUT_CRASH; diff --git a/install.xml b/install.xml index 1ac6f7d918..e59634fcb2 100644 --- a/install.xml +++ b/install.xml @@ -595,10 +595,17 @@ darwin + i386 + + md5sum + 84139a373314b85e0c27e13a5263dcc6 + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/google_breakpad-0.0.0-rev599-darwin-20100519.tar.bz2 + md5sum - 34bb9d8dd8247fdbe238cf96813f333b + c7b20b28a256a74fb646bd2ddbc3ec32 url - http://viewer-source-downloads.s3.amazonaws.com/install_pkgs/google_breakpad-0.0.0-rev599-darwin-20100517.tar.bz2 + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/google_breakpad-0.0.0-rev599-darwin-20100519a.tar.bz2 windows -- cgit v1.3 From ba809777e5ba240622f6c67ff400733899c275bf Mon Sep 17 00:00:00 2001 From: brad kittenbrink Date: Fri, 21 May 2010 14:39:55 -0700 Subject: New google breakpad package for windows with winsock2 fix, and DLL CRT library usage. Also moved headers into libraries/include/google_breakpad. Mac and linux packages to come shortly. --- indra/llcommon/llapp.h | 2 +- install.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'install.xml') diff --git a/indra/llcommon/llapp.h b/indra/llcommon/llapp.h index cd17532203..348eec0c48 100644 --- a/indra/llcommon/llapp.h +++ b/indra/llcommon/llapp.h @@ -38,7 +38,7 @@ #include "llsd.h" #include "lloptioninterface.h" -#include "exception_handler.h" +#include "google_breakpad/exception_handler.h" // Forward declarations template class LLAtomic32; diff --git a/install.xml b/install.xml index e59634fcb2..928dd862c5 100644 --- a/install.xml +++ b/install.xml @@ -610,9 +610,9 @@ windows md5sum - 0dc3f96299a182cad538ff134547a2e3 + d9858d7be95d89d573daf196a8b3a3dc url - http://viewer-source-downloads.s3.amazonaws.com/install_pkgs/google_breakpad-0.0.0-rev599-windows-20100518.tar.bz2 + http://viewer-source-downloads.s3.amazonaws.com/install_pkgs/google_breakpad-0.0.0-rev599-windows-20100521g.tar.bz2 -- cgit v1.3 From 95d7aab108516826f459c7202ea5941e94d0c5eb Mon Sep 17 00:00:00 2001 From: brad kittenbrink Date: Fri, 21 May 2010 15:48:40 -0700 Subject: New windows google_breakpad package with GUIDString class included in common.lib. I've confimred that llcommon links now. --- indra/cmake/GoogleBreakpad.cmake | 2 +- install.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'install.xml') diff --git a/indra/cmake/GoogleBreakpad.cmake b/indra/cmake/GoogleBreakpad.cmake index e45518ef56..3aac79eeeb 100644 --- a/indra/cmake/GoogleBreakpad.cmake +++ b/indra/cmake/GoogleBreakpad.cmake @@ -6,6 +6,6 @@ if (STANDALONE) # *TODO - implement this include(FindGoogleBreakpad) else (STANDALONE) use_prebuilt_binary(google_breakpad) - set(BREAKPAD_EXCEPTION_HANDLER_LIBRARIES exception_handler) + set(BREAKPAD_EXCEPTION_HANDLER_LIBRARIES exception_handler crash_generation_client common) endif (STANDALONE) diff --git a/install.xml b/install.xml index 928dd862c5..9a015a7eb0 100644 --- a/install.xml +++ b/install.xml @@ -610,9 +610,9 @@ windows md5sum - d9858d7be95d89d573daf196a8b3a3dc + e2c282513dd20f3198fb6d83d9cfd709 url - http://viewer-source-downloads.s3.amazonaws.com/install_pkgs/google_breakpad-0.0.0-rev599-windows-20100521g.tar.bz2 + http://viewer-source-downloads.s3.amazonaws.com/install_pkgs/google_breakpad-0.0.0-rev599-windows-20100521h.tar.bz2 -- cgit v1.3 From d5a6cac57d737455159a7b340160009ae5f08edd Mon Sep 17 00:00:00 2001 From: brad kittenbrink Date: Fri, 21 May 2010 16:05:37 -0700 Subject: New mac package of google_breakpad compatibile with the recent windows changes. --- install.xml | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'install.xml') diff --git a/install.xml b/install.xml index 9a015a7eb0..ce035fb1a0 100644 --- a/install.xml +++ b/install.xml @@ -595,17 +595,10 @@ darwin - i386 - - md5sum - 84139a373314b85e0c27e13a5263dcc6 - url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/google_breakpad-0.0.0-rev599-darwin-20100519.tar.bz2 - md5sum - c7b20b28a256a74fb646bd2ddbc3ec32 + 46536b8a3311e71691ba045b8572c9eb url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/google_breakpad-0.0.0-rev599-darwin-20100519a.tar.bz2 + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/google_breakpad-0.0.0-rev599-darwin-20100521a.tar.bz2 windows -- cgit v1.3 From d9fee67f976b72a3c6145627638e4e15a8f54d7e Mon Sep 17 00:00:00 2001 From: brad kittenbrink Date: Fri, 21 May 2010 19:09:53 -0700 Subject: VPLAT-237 Linux client library package for google_breakpad. --- indra/cmake/Copy3rdPartyLibs.cmake | 3 ++- indra/cmake/GoogleBreakpad.cmake | 3 +++ indra/newview/viewer_manifest.py | 1 + install.xml | 7 +++++++ 4 files changed, 13 insertions(+), 1 deletion(-) (limited to 'install.xml') diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake index faf9da8b14..937d3c6384 100644 --- a/indra/cmake/Copy3rdPartyLibs.cmake +++ b/indra/cmake/Copy3rdPartyLibs.cmake @@ -19,7 +19,7 @@ if(WINDOWS) set(vivox_src_dir "${CMAKE_SOURCE_DIR}/newview/vivox-runtime/i686-win32") set(vivox_files SLVoice.exe - libsndfile-1.dll + libsndfile-1.dll vivoxplatform.dll vivoxsdk.dll ortp.dll @@ -216,6 +216,7 @@ elseif(LINUX) libapr-1.so.0 libaprutil-1.so.0 libatk-1.0.so + libbreakpad_client.so.0 libcrypto.so.0.9.7 libdb-4.2.so libexpat.so diff --git a/indra/cmake/GoogleBreakpad.cmake b/indra/cmake/GoogleBreakpad.cmake index 3aac79eeeb..0b9f4a00d0 100644 --- a/indra/cmake/GoogleBreakpad.cmake +++ b/indra/cmake/GoogleBreakpad.cmake @@ -7,5 +7,8 @@ if (STANDALONE) else (STANDALONE) use_prebuilt_binary(google_breakpad) set(BREAKPAD_EXCEPTION_HANDLER_LIBRARIES exception_handler crash_generation_client common) + if (LINUX) + set(BREAKPAD_EXCEPTION_HANDLER_LIBRARIES breakpad_client) + endif (LINUX) endif (STANDALONE) diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 2a966f4adf..96541088b5 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -888,6 +888,7 @@ class Linux_i686Manifest(LinuxManifest): if self.prefix("../../libraries/i686-linux/lib_release_client", dst="lib"): self.path("libapr-1.so.0") self.path("libaprutil-1.so.0") + self.path("libbreakpad_client.so.0.0.0", "libbreakpad_client.so.0") self.path("libdb-4.2.so") self.path("libcrypto.so.0.9.7") self.path("libexpat.so.1") diff --git a/install.xml b/install.xml index ce035fb1a0..85528b6697 100644 --- a/install.xml +++ b/install.xml @@ -600,6 +600,13 @@ url http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/google_breakpad-0.0.0-rev599-darwin-20100521a.tar.bz2 + linux + + md5sum + 29c3e7dad60bbf02c811786436d99523 + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/google_breakpad-0.0.0-rev599-linux-20100521b.tar.bz2 + windows md5sum -- cgit v1.3 From 168fbc9b37923873aeb6d87d71d9e33064f46351 Mon Sep 17 00:00:00 2001 From: brad kittenbrink Date: Mon, 24 May 2010 12:11:03 -0700 Subject: New windows package of google_breakpad with correct /Zc:wchar_t- setting for ABI compatibility. --- install.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'install.xml') diff --git a/install.xml b/install.xml index 85528b6697..0bf0f852e4 100644 --- a/install.xml +++ b/install.xml @@ -610,9 +610,9 @@ windows md5sum - e2c282513dd20f3198fb6d83d9cfd709 + 0859d47242990125f17eaab30bece2ff url - http://viewer-source-downloads.s3.amazonaws.com/install_pkgs/google_breakpad-0.0.0-rev599-windows-20100521h.tar.bz2 + http://viewer-source-downloads.s3.amazonaws.com/install_pkgs/google_breakpad-0.0.0-rev599-windows-20100524.tar.bz2 -- cgit v1.3 From 879f0cd5fd7582546f18054b99fa127942d63e3d Mon Sep 17 00:00:00 2001 From: Callum Prentice Date: Tue, 25 May 2010 16:06:01 -0700 Subject: Updated install.xml to point to a version of temporary version LLQtWebKit that skips past SSL/Cert errors so QuickBuy functions can be tested. (Windows only) Also tweaked the QuickBuy Currency floater so scrollbars do not appear for current Web content --- .../skins/default/xui/en/floater_buy_currency_html.xml | 16 ++++++++-------- install.xml | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) (limited to 'install.xml') diff --git a/indra/newview/skins/default/xui/en/floater_buy_currency_html.xml b/indra/newview/skins/default/xui/en/floater_buy_currency_html.xml index ab44082070..4643f66bd8 100644 --- a/indra/newview/skins/default/xui/en/floater_buy_currency_html.xml +++ b/indra/newview/skins/default/xui/en/floater_buy_currency_html.xml @@ -2,26 +2,26 @@ + width="452"> - http://user.lindenlab.com/~callum/ez/index.php?lang=[LANGUAGE]&sa=[SPECIFIC_AMOUNT]&sum=[SUM]&msg=[MSG]&bal=[BAL] - + https://quick-buy-www.jeff.ooze.lindenlab.com/en/display + + width="450" /> diff --git a/install.xml b/install.xml index bb2f8c1f2f..c6b6ffda81 100644 --- a/install.xml +++ b/install.xml @@ -962,9 +962,9 @@ anguage Infrstructure (CLI) international standard windows md5sum - d682ed6232193b4eab3170657a54ebf9 + 1d9697fed57084eea7b3dc250e9c66f7 url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/llqtwebkit-windows-qt4.6-20100519.tar.bz2 + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/llqtwebkit-windows-qt4.6-20100525.tar.bz2 -- cgit v1.3 From 0bf02ad820abdb35b9cfdfbd1635953e63a767b2 Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Wed, 26 May 2010 12:21:55 -0400 Subject: VPLAT-268: Update Mac for relative-path libexception_handler.dylib Also add the dylib to Copy3rdPartyLibs.cmake so unit tests can find it. --- indra/cmake/Copy3rdPartyLibs.cmake | 1 + install.xml | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'install.xml') diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake index 937d3c6384..89422fbdb2 100644 --- a/indra/cmake/Copy3rdPartyLibs.cmake +++ b/indra/cmake/Copy3rdPartyLibs.cmake @@ -167,6 +167,7 @@ elseif(DARWIN) libexpat.dylib libllqtwebkit.dylib libndofdev.dylib + libexception_handler.dylib ) # fmod is statically linked on darwin diff --git a/install.xml b/install.xml index 0bf0f852e4..c280350fe9 100644 --- a/install.xml +++ b/install.xml @@ -596,9 +596,9 @@ darwin md5sum - 46536b8a3311e71691ba045b8572c9eb + 44c79d6629598b937a69e3a37ec53cf1 url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/google_breakpad-0.0.0-rev599-darwin-20100521a.tar.bz2 + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/google_breakpad-0.0.0-rev599-darwin-20100525.tar.bz2 linux -- cgit v1.3 From 8eb3829ef7e22eb934a36476cba10d651b528bf2 Mon Sep 17 00:00:00 2001 From: Tofu Linden Date: Thu, 27 May 2010 12:21:21 +0100 Subject: EXT-7145: PARTIAL make viewer to handle "URL redirect " for http texture. This upgrades linux libcurl(+ares) to the lindenlib 7.20.1 version. --- install.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'install.xml') diff --git a/install.xml b/install.xml index c6b6ffda81..1265963fb1 100644 --- a/install.xml +++ b/install.xml @@ -118,9 +118,9 @@ linux md5sum - 946c2e106f14f7a1e521d4a14e0e146f + 91694429e391efeea1de974df26032a2 url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/ares-1.4.0-linux-20081202.tar.bz2 + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/ares-1.7.1-linux-20100527.tar.bz2 linux64 @@ -240,9 +240,9 @@ linux md5sum - 0f366e421ae9c72d9659bd20a2a326d6 + a20e73f2e7d6a032ff25a5161b1b7394 url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/curl-7.16.4a-linux-20090303a.tar.bz2 + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/curl-7.20.1-linux-20100527.tar.bz2 linux64 -- cgit v1.3 From 7d501b11641a32ae02783fdb2032afc4669a3c53 Mon Sep 17 00:00:00 2001 From: brad kittenbrink Date: Thu, 27 May 2010 14:30:15 -0700 Subject: WIP VPLAT-248 - New library package for google_breakpad on mac including dump_syms tool. --- install.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'install.xml') diff --git a/install.xml b/install.xml index c280350fe9..6f96ad1230 100644 --- a/install.xml +++ b/install.xml @@ -596,9 +596,9 @@ darwin md5sum - 44c79d6629598b937a69e3a37ec53cf1 + 765f207aab10c5bf70d328927cf88e8f url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/google_breakpad-0.0.0-rev599-darwin-20100525.tar.bz2 + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/google_breakpad-0.0.0-rev599-darwin-20100527.tar.bz2 linux -- cgit v1.3 From 2567519f9f45c0fd9a7d976bc232217e0b19a3a2 Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Fri, 28 May 2010 15:47:31 -0400 Subject: Use OS X 10.5 build of breakpad library --- install.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'install.xml') diff --git a/install.xml b/install.xml index 52ae27432b..7ac54354f2 100644 --- a/install.xml +++ b/install.xml @@ -596,9 +596,9 @@ darwin md5sum - 765f207aab10c5bf70d328927cf88e8f + 864f0a80beeb88b9f86be94f00c5c65e url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/google_breakpad-0.0.0-rev599-darwin-20100527.tar.bz2 + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/google_breakpad-0.0.0-rev599-darwin-20100528.tar.bz2 linux -- cgit v1.3 From de52f3ae69f7641966304ea42d399b62f3fc3170 Mon Sep 17 00:00:00 2001 From: Aimee Linden Date: Sat, 29 May 2010 23:17:28 +0100 Subject: EXT-7556 FIXED Update Vivox SDK to 3.1.0001.8821 --- install.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'install.xml') diff --git a/install.xml b/install.xml index 1265963fb1..ccebe2fe50 100644 --- a/install.xml +++ b/install.xml @@ -1386,23 +1386,23 @@ anguage Infrstructure (CLI) international standard darwin md5sum - 4d29351a842fafe617de65a8183da160 + aa144917d0e33453d3c2cc2c05c6c47c url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/vivox-3.1.0001.8744-darwin-20100519.tar.bz2 + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/vivox-3.1.0001.8821-darwin-20100529.tar.bz2 linux md5sum - 7541138c439b1c0312610d18968f27d2 + 98f7945755f3ee8e52f685a3eff4d7be url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/vivox-3.1.0001.8744-linux-20100519.tar.bz2 + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/vivox-3.1.0001.8821-linux-20100529.tar.bz2 windows md5sum - 5d2b049ca5239da2dcebde91f7f25a43 + e8fdd46cb026c2ec72c4489eb3bf39c1 url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/vivox-3.1.0001.8744-windows-20100519.tar.bz2 + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/vivox-3.1.0001.8821-windows-20100529.tar.bz2 -- cgit v1.3 From bca692a76dccca39ad9a67d87ddaf00ac74350fe Mon Sep 17 00:00:00 2001 From: brad kittenbrink Date: Fri, 28 May 2010 14:29:58 -0700 Subject: Use os x 10.4 deployment target for google_breakpad library package. --- install.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'install.xml') diff --git a/install.xml b/install.xml index 7ac54354f2..aedfc0be60 100644 --- a/install.xml +++ b/install.xml @@ -596,9 +596,9 @@ darwin md5sum - 864f0a80beeb88b9f86be94f00c5c65e + ced4010b59f1a579caa7fe3c18512499 url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/google_breakpad-0.0.0-rev599-darwin-20100528.tar.bz2 + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/google_breakpad-0.0.0-rev599-darwin-20100528a.tar.bz2 linux -- cgit v1.3 From b982ddfb0c0b7d50316e355b508e88864cbb87f3 Mon Sep 17 00:00:00 2001 From: callum Date: Thu, 10 Jun 2010 16:42:05 -0700 Subject: Remove SSL/cert hack from LLQtWebKit version used for testing. http://lltrial.onjira.com/browse/VI-153 --- install.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'install.xml') diff --git a/install.xml b/install.xml index 8387372400..80641d29e6 100644 --- a/install.xml +++ b/install.xml @@ -962,9 +962,9 @@ anguage Infrstructure (CLI) international standard windows md5sum - 1d9697fed57084eea7b3dc250e9c66f7 + d682ed6232193b4eab3170657a54ebf9 url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/llqtwebkit-windows-qt4.6-20100525.tar.bz2 + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/llqtwebkit-windows-qt4.6-20100519.tar.bz2 -- cgit v1.3 From aaf296c2cec420d6f1b3623e1413e71b00cf3966 Mon Sep 17 00:00:00 2001 From: Aimee Linden Date: Mon, 7 Jun 2010 14:59:01 +0100 Subject: EXT-7145: PARTIAL make viewer to handle "URL redirect" for http texture. Upgrade Darwin libcurl to 7.20.1 and ares to 1.7.1 --- install.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'install.xml') diff --git a/install.xml b/install.xml index ccebe2fe50..8387372400 100644 --- a/install.xml +++ b/install.xml @@ -111,9 +111,9 @@ darwin md5sum - d9ce3ace9235249b7edf6f564de83395 + cdb2f5c4a5a1f9ecd75bc1dbdd4db8e9 url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/ares-1.4.0-darwin-20080731b.tar.bz2 + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/ares-1.7.1-darwin-20100606.tar.bz2 linux @@ -233,9 +233,9 @@ darwin md5sum - 1bece4ebdc5fc3818854bc3df14b511b + 752e295ccb17f0dcb7c0167db3ad1e69 url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/curl-7.16.4a-darwin-20090304.tar.bz2 + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/curl-7.20.1-darwin-20100606.tar.bz2 linux -- cgit v1.3 From 788c787ea7bb80d1a9b29f210d9af9f4da5d4cdb Mon Sep 17 00:00:00 2001 From: brad kittenbrink Date: Fri, 11 Jun 2010 18:56:18 -0700 Subject: Upgraded windows libcurl to 7.20.1 and c-ares to 1.7.1 for consistency with mac/linux and potentially improve EXT-7032 behavior. --- indra/cmake/CARes.cmake | 1 + indra/llmessage/llares.cpp | 2 +- install.xml | 8 ++++---- 3 files changed, 6 insertions(+), 5 deletions(-) (limited to 'install.xml') diff --git a/indra/cmake/CARes.cmake b/indra/cmake/CARes.cmake index 8a2dc01561..1850b706ac 100644 --- a/indra/cmake/CARes.cmake +++ b/indra/cmake/CARes.cmake @@ -9,6 +9,7 @@ if (STANDALONE) include(FindCARes) else (STANDALONE) use_prebuilt_binary(ares) + add_definitions("-DCARES_STATICLIB") if (WINDOWS) set(CARES_LIBRARIES areslib) elseif (DARWIN) diff --git a/indra/llmessage/llares.cpp b/indra/llmessage/llares.cpp index 00e77d20e9..78561b37aa 100644 --- a/indra/llmessage/llares.cpp +++ b/indra/llmessage/llares.cpp @@ -473,7 +473,7 @@ bool LLAres::process(U64 timeout) ll_init_apr(); } - int socks[ARES_GETSOCK_MAXNUM]; + ares_socket_t socks[ARES_GETSOCK_MAXNUM]; apr_pollfd_t aprFds[ARES_GETSOCK_MAXNUM]; apr_int32_t nsds = 0; int nactive = 0; diff --git a/install.xml b/install.xml index eeea250171..1f3e74a27a 100644 --- a/install.xml +++ b/install.xml @@ -132,9 +132,9 @@ windows md5sum - f5cf8d121b26f2e7944f7e63cdbff04d + 4b84738eec2e21b0c096d53b79ee2681 url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/ares-1.6.0-windows-20091105.tar.bz2 + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/ares-1.7.1-windows-20100611a.tar.bz2 @@ -254,9 +254,9 @@ windows md5sum - 78ccac8aaf8ea5bec482dfbcdbeb1651 + b28856d3d02ee680353ae440561a6579 url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/curl-7.19.6-windows-20100414.tar.bz2 + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/curl-7.20.1-windows-20100611.tar.bz2 -- cgit v1.3 From 107aee0c6eb17d6433de60e35d33dc4779a6a9e3 Mon Sep 17 00:00:00 2001 From: callum Date: Thu, 17 Jun 2010 15:16:55 -0700 Subject: EXT-7326 FIXED (Viewer web browsers (MOAP & Media Browser) not using Viewer locale for Accept-Language header) This fix is achieved by deploying and referring to a new version of the LLQtWebKit WebKit library --- install.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'install.xml') diff --git a/install.xml b/install.xml index 1f3e74a27a..8b1c824acf 100644 --- a/install.xml +++ b/install.xml @@ -995,9 +995,9 @@ anguage Infrstructure (CLI) international standard windows md5sum - d682ed6232193b4eab3170657a54ebf9 + df1bdd683128e060d60e435f65d8f7e8 url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/llqtwebkit-windows-qt4.6-20100519.tar.bz2 + http://viewer-source-downloads.s3.amazonaws.com/install_pkgs/llqtwebkit-windows-qt4.6-20100617.tar.bz2 -- cgit v1.3 From cd12d50cb2ce1ad634dc800c9d0cda6745559a47 Mon Sep 17 00:00:00 2001 From: Monroe Linden Date: Thu, 17 Jun 2010 15:29:59 -0700 Subject: New Mac build of llqtwebkit to fix EXT-7326 (Viewer web browsers (MOAP & Media Browser) not using Viewer locale for Accept-Language header) Built from revision b9227bb7dbaf of llqtwebkit and revision aacdf69cbf5aa12d77c179296e31ef643ed1ef4a of lindenqt. --- install.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'install.xml') diff --git a/install.xml b/install.xml index 8b1c824acf..5f444dd016 100644 --- a/install.xml +++ b/install.xml @@ -981,9 +981,9 @@ anguage Infrstructure (CLI) international standard darwin md5sum - 1417e04ca4bec1ed281c43d37b613845 + becffca6bd8dcb239de284ea2a8b485b url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/llqtwebkit-4.6+cookies-darwin-20100519.tar.bz2 + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/llqtwebkit-4.6+cookies-darwin-20100617.tar.bz2 linux -- cgit v1.3 From cc0d5eae4d59adf41d59248e1b481a66db791b07 Mon Sep 17 00:00:00 2001 From: Tofu Linden Date: Fri, 18 Jun 2010 16:17:34 +0100 Subject: Fix llpreviewgesture.h build borkage. --- indra/newview/llpreviewgesture.h | 2 +- install.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'install.xml') diff --git a/indra/newview/llpreviewgesture.h b/indra/newview/llpreviewgesture.h index 1814f0d403..b141b14445 100644 --- a/indra/newview/llpreviewgesture.h +++ b/indra/newview/llpreviewgesture.h @@ -35,8 +35,8 @@ #include "llassettype.h" #include "llpreview.h" +#include "llmultigesture.h" -class LLMultiGesture; class LLLineEditor; class LLTextBox; class LLCheckBoxCtrl; diff --git a/install.xml b/install.xml index 5f444dd016..f69d781c67 100644 --- a/install.xml +++ b/install.xml @@ -988,9 +988,9 @@ anguage Infrstructure (CLI) international standard linux md5sum - 7a5e02d252b76ab41bdca58506fa4147 + 414d72dd59e3d83c96f0e1531360792e url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/llqtwebkit-linux-20100521.tar.bz2 + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/llqtwebkit-linux-20100618.tar.bz2 windows -- cgit v1.3 From 8f892d0f36fda170a5cecf0aea89887d6d0e45ef Mon Sep 17 00:00:00 2001 From: Tofu Linden Date: Thu, 24 Jun 2010 13:04:20 +0100 Subject: SNOW-611 / SNOW-505 FIXED boost::coroutines headers broken for newish GCC versions. --- install.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'install.xml') diff --git a/install.xml b/install.xml index f69d781c67..39806a664d 100644 --- a/install.xml +++ b/install.xml @@ -200,9 +200,9 @@ linux md5sum - d58ac1a8396ac983b67cc3e3541457e3 + 4db3d74e40d149eeec06f4d97a609bb1 url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/boost-1.39.0-linux-20100222a.tar.bz2 + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/boost-1.39.0-linux-20100624.tar.bz2 linux64 -- cgit v1.3 From fed730b0eef0a528e9d20d946ea397d67cf46fe5 Mon Sep 17 00:00:00 2001 From: brad kittenbrink Date: Wed, 30 Jun 2010 17:30:32 -0700 Subject: Fix for windows build breakage. Set WINVER and _WIN32_WINNT preprocessor definitions appropriately for using windows XP API calls. --- indra/cmake/00-Common.cmake | 4 ++++ install.xml | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'install.xml') diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake index 592e9fc901..a114d6e778 100644 --- a/indra/cmake/00-Common.cmake +++ b/indra/cmake/00-Common.cmake @@ -74,6 +74,10 @@ if (WINDOWS) if (NOT VS_DISABLE_FATAL_WARNINGS) add_definitions(/WX) endif (NOT VS_DISABLE_FATAL_WARNINGS) + + # configure win32 API for windows XP+ compatibility + set(WINVER "0x0501" CACHE STRING "Win32 API Target version (see http://msdn.microsoft.com/en-us/library/aa383745%28v=VS.85%29.aspx)") + add_definitions("/DWINVER=${WINVER}" "/D_WIN32_WINNT=${WINVER}") endif (WINDOWS) diff --git a/install.xml b/install.xml index 39806a664d..3795fc3757 100644 --- a/install.xml +++ b/install.xml @@ -214,9 +214,9 @@ windows md5sum - 94fd43f534e2055858d524086384907d + 72e6e2eff5d146a107f3059b6c31fb95 url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/boost-1.39.0-windows-20100219.tar.bz2 + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/boost-1.39.0-windows-20100630.tar.bz2 -- cgit v1.3