diff options
author | Glenn Glazer <coyot@lindenlab.com> | 2016-05-11 08:33:04 -0700 |
---|---|---|
committer | Glenn Glazer <coyot@lindenlab.com> | 2016-05-11 08:33:04 -0700 |
commit | 7061ef3deaf72719050a6b6cfa9d8f509ef24b0c (patch) | |
tree | 1f8121d27180df45470fbe6219aceddc8df1c407 /indra/newview/llappviewermacosx.cpp | |
parent | df55966b112142e194f07386a3673f395ec792fc (diff) | |
parent | 7f5e6cea124e1193b199a3eabd50bdab96340c13 (diff) |
merge
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); } |