summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorGlenn Glazer <coyot@lindenlab.com>2016-02-25 10:34:18 -0800
committerGlenn Glazer <coyot@lindenlab.com>2016-02-25 10:34:18 -0800
commitaca314de1f74bc4cab06dfc4b99e6604213b22b5 (patch)
tree5a30de3ebd0828c22a7edbd314c38ff011c77703 /indra/newview
parent281521fe42facc08c00ea6df902e31a6749d6eea (diff)
parentb09f0a120e53c8b27d196df6a33a42c9ac0e146c (diff)
maint-5974/maint-5422: viewer changes for new crash reporting
Diffstat (limited to 'indra/newview')
-rwxr-xr-xindra/newview/llappviewermacosx.cpp5
1 files changed, 1 insertions, 4 deletions
diff --git a/indra/newview/llappviewermacosx.cpp b/indra/newview/llappviewermacosx.cpp
index 09227806fd..ca219fda59 100755
--- a/indra/newview/llappviewermacosx.cpp
+++ b/indra/newview/llappviewermacosx.cpp
@@ -83,10 +83,6 @@ static void exceptionTerminateHandler()
bool initViewer()
{
-#if LL_SOLARIS && defined(__sparc)
- asm ("ta\t6"); // NOTE: Make sure memory alignment is enforced on SPARC
-#endif
-
// Set the working dir to <bundle>/Contents/Resources
if (chdir(gDirUtilp->getAppRODataDir().c_str()) == -1)
{
@@ -301,6 +297,7 @@ void LLAppViewerMacOSX::initCrashReporting(bool reportFreeze)
std::string appname = gDirUtilp->getExecutableFilename();
std::string str[] = { "-pid", pid_str.str(), "-dumpdir", logdir, "-procname", appname.c_str() };
std::vector< std::string > args( str, str + ( sizeof ( str ) / sizeof ( std::string ) ) );
+ LL_WARNS() << "about to launch mac-crash-logger" << pid_str << " " << logdir << " " << appname << LL_ENDL;
launchApplication(&command_str, &args);
}