diff options
author | Oz Linden <oz@lindenlab.com> | 2013-03-13 15:15:15 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2013-03-13 15:15:15 -0400 |
commit | 75722baf295aff7927bff3c70cdf0ec27399cb37 (patch) | |
tree | a7a3fccc7bfebb4605c561e34ac66ad3c478368e /indra/newview/llappviewermacosx.cpp | |
parent | 5c68b2456e8603322a1f12694c196246752bab53 (diff) | |
parent | d348deb7049cbaef7c228000525c7ee5a265464c (diff) |
merge changes for latest viewer-development
Diffstat (limited to 'indra/newview/llappviewermacosx.cpp')
-rw-r--r-- | indra/newview/llappviewermacosx.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/indra/newview/llappviewermacosx.cpp b/indra/newview/llappviewermacosx.cpp index c2916717bd..4d340cafa9 100644 --- a/indra/newview/llappviewermacosx.cpp +++ b/indra/newview/llappviewermacosx.cpp @@ -33,8 +33,6 @@ #include "llappviewermacosx.h" #include "llcommandlineparser.h" -#include "llmemtype.h" - #include "llviewernetwork.h" #include "llviewercontrol.h" #include "llmd5.h" @@ -67,8 +65,6 @@ namespace int main( int argc, char **argv ) { - LLMemType mt1(LLMemType::MTYPE_STARTUP); - #if LL_SOLARIS && defined(__sparc) asm ("ta\t6"); // NOTE: Make sure memory alignment is enforced on SPARC #endif |