diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-03-18 14:30:57 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-03-18 14:30:57 -0400 |
| commit | ed7785bf97a601448ba2da5fb2f19ea2861454c5 (patch) | |
| tree | 17e8d9ccf28ae30c5029ecea7e0ab8bed0fe3926 /indra/newview/llappviewerlinux.cpp | |
| parent | c8533650b4779040c5e196f9ff156e3454edc9c8 (diff) | |
| parent | bf95c1cae7a84d1a97dacd8ea7f1b6af8be067a9 (diff) | |
merge up to 3.5.0-beta3 (chui)
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 |