diff options
| author | callum_linden <none@none> | 2016-05-06 13:41:46 -0700 |
|---|---|---|
| committer | callum_linden <none@none> | 2016-05-06 13:41:46 -0700 |
| commit | 94a8c1138918cbd4a5b4ee634389265da335f1b2 (patch) | |
| tree | 92ade9389eb7229ae1d7ab92e1cb0f5870bd7021 /indra/newview/llappviewermacosx.cpp | |
| parent | c5d6bfe8ae61e3311c260626b590586d3cde4b6e (diff) | |
| parent | 7f5e6cea124e1193b199a3eabd50bdab96340c13 (diff) | |
Merge with https://bitbucket.org/oz_linden/maint-5974 to pick up a variety of fixes
Diffstat (limited to 'indra/newview/llappviewermacosx.cpp')
| -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 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); } |