diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-02-14 09:05:55 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-02-14 09:05:55 -0500 |
| commit | c880c961bb2a0838bc529efc07cfeb12f5636d88 (patch) | |
| tree | beff6cda58f68c5d95277cf77957dc96c2a79dfd /indra/newview/llappviewerlinux.cpp | |
| parent | 841dc5da2ef9626fa4ab9255681d217df62a6b0b (diff) | |
| parent | e87000ba0750e55d9d6b55feccc4124f5d2b4b74 (diff) | |
merge changes for 3.4.5
Diffstat (limited to 'indra/newview/llappviewerlinux.cpp')
| -rw-r--r-- | indra/newview/llappviewerlinux.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/indra/newview/llappviewerlinux.cpp b/indra/newview/llappviewerlinux.cpp index e8d8efdc0a..8695652168 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 |