diff options
| author | Baker Linden <baker@lindenlab.com> | 2013-01-09 15:25:06 -0800 |
|---|---|---|
| committer | Baker Linden <baker@lindenlab.com> | 2013-01-09 15:25:06 -0800 |
| commit | c4a1bd1c2f2e8da202c59d756e5d49b273e5145c (patch) | |
| tree | 96f3ccbb2c5d534f021052fafab97bedd6d57e91 /indra/newview/llappviewermacosx.cpp | |
| parent | b0c449d301299a4ba1b7d83e930f9df6b071b931 (diff) | |
| parent | cdd45b9abb35b40f2a31e7433fb99e588df8b40b (diff) | |
viewer-development merge
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 |