diff options
| author | Dave Parks <davep@lindenlab.com> | 2012-07-30 12:20:52 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2012-07-30 12:20:52 -0500 |
| commit | 99048664647e696dd7ddcd90f5363d0b70bca8dc (patch) | |
| tree | 332ee7e89fffd309077a2594c08c3fcceb84d4df | |
| parent | 64fc52d85ea04a860e0f1670bbbf67efea977513 (diff) | |
| parent | 267c01d4c8724adcfa9a9603d24e13cce037f89f (diff) | |
merge
| -rw-r--r-- | indra/newview/llappviewerlinux.cpp | 3 | ||||
| -rw-r--r-- | indra/newview/llappviewermacosx.cpp | 4 |
2 files changed, 0 insertions, 7 deletions
diff --git a/indra/newview/llappviewerlinux.cpp b/indra/newview/llappviewerlinux.cpp index 48d02dfeaa..a19ad1eceb 100644 --- a/indra/newview/llappviewerlinux.cpp +++ b/indra/newview/llappviewerlinux.cpp @@ -31,7 +31,6 @@ #include "llcommandlineparser.h" #include "lldiriterator.h" -#include "llmemtype.h" #include "llurldispatcher.h" // SLURL from other app instance #include "llviewernetwork.h" #include "llviewercontrol.h" @@ -71,8 +70,6 @@ static void exceptionTerminateHandler() 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 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 |