diff options
| author | Oz Linden <oz@lindenlab.com> | 2016-04-08 11:32:48 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2016-04-08 11:32:48 -0400 |
| commit | ed38b5c9235b35cc4aa7448be2897c5fffbc684e (patch) | |
| tree | 5091ca719379258f0cc22f3866bdc757d1727b36 /indra/newview | |
| parent | f0107eb8aae46a928b0b3e6564cc4ed3031e1271 (diff) | |
| parent | 2446fab3746bfef453ec8e3d5a31b30e8f3f91e1 (diff) | |
merge changes for MAINT-5974
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | 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 09227806fd..ca219fda59 100644 --- 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); } |