diff options
| author | Geenz <geenz@geenzo.com> | 2013-01-24 16:36:31 -0500 |
|---|---|---|
| committer | Geenz <geenz@geenzo.com> | 2013-01-24 16:36:31 -0500 |
| commit | f39532c407229403f6d67312638bf5dc3514687d (patch) | |
| tree | de0f376b3bbe03d585f989adf02c3eadb01347f2 /indra/newview/llappviewermacosx.cpp | |
| parent | a82ff3fcb7556bd810ec37c0b74c565b42e92250 (diff) | |
| parent | a30a2c492d06c9ef843a43c0ff0be6f2826d6d0b (diff) | |
Merged with latest viewer-dev.
Diffstat (limited to 'indra/newview/llappviewermacosx.cpp')
| -rw-r--r-- | indra/newview/llappviewermacosx.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/llappviewermacosx.cpp b/indra/newview/llappviewermacosx.cpp index 6e0becb518..28210d18dd 100644 --- a/indra/newview/llappviewermacosx.cpp +++ b/indra/newview/llappviewermacosx.cpp @@ -34,8 +34,6 @@ #include "llwindowmacosx-objc.h" #include "llcommandlineparser.h" -#include "llmemtype.h" - #include "llviewernetwork.h" #include "llviewercontrol.h" #include "llmd5.h" @@ -59,8 +57,10 @@ namespace bool initViewer() { - LLMemType mt1(LLMemType::MTYPE_STARTUP); - +#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) { |