diff options
| author | Glenn Glazer <coyot@lindenlab.com> | 2015-09-16 14:21:03 -0700 |
|---|---|---|
| committer | Glenn Glazer <coyot@lindenlab.com> | 2015-09-16 14:21:03 -0700 |
| commit | b09f0a120e53c8b27d196df6a33a42c9ac0e146c (patch) | |
| tree | ec0eb9ec35ed7a5fe62a98e1c12f272363467879 /indra/newview | |
| parent | 1be63209331d509396bd7ee79302d511fe83d72e (diff) | |
maint-5422 changes and merge from release
Diffstat (limited to 'indra/newview')
| -rwxr-xr-x | indra/newview/llappviewermacosx.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/indra/newview/llappviewermacosx.cpp b/indra/newview/llappviewermacosx.cpp index 56154a2de3..b85f3249bf 100755 --- a/indra/newview/llappviewermacosx.cpp +++ b/indra/newview/llappviewermacosx.cpp @@ -82,10 +82,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) { @@ -296,6 +292,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); } |