diff options
| author | maxim@mnikolenko <maxim@mnikolenko> | 2013-01-31 19:25:42 +0200 |
|---|---|---|
| committer | maxim@mnikolenko <maxim@mnikolenko> | 2013-01-31 19:25:42 +0200 |
| commit | 2ec0d24e4a0beac5afba992b37f97c30d972342b (patch) | |
| tree | 55842c2c5238b75a70eb99c3356fe99196530dc7 /indra/newview/llappviewerlinux.cpp | |
| parent | 8714b610149a5ae7b6f248023722f237c9336472 (diff) | |
| parent | 22835e1ddb39341df26681dde8d22c673cc3940b (diff) | |
Merge
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 |