diff options
| author | Merov Linden <merov@lindenlab.com> | 2013-01-30 20:01:03 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2013-01-30 20:01:03 -0800 |
| commit | faae38daaaf30fd96b217316cf3eafb095ff35bc (patch) | |
| tree | e73c2991dcfffa2c4d4260fff6102d65be1e1312 /indra/newview/llappviewermacosx.cpp | |
| parent | 6af899f19e246c7fe4faa1edcdfbcfe9f01dbd25 (diff) | |
| parent | e7c0f69c8e0509d822c6f7410bc0d5bb10fde522 (diff) | |
Pull merge from lindenlab/viewer-developement
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 |