diff options
| author | Richard Linden <none@none> | 2012-09-06 11:47:48 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2012-09-06 11:47:48 -0700 |
| commit | 371b66a6ef7eb2568e3127c1c59326bce6e26ab8 (patch) | |
| tree | 9154fa799fc37df8cb493f921b41ad79596e903c /indra/newview/llappviewerlinux.cpp | |
| parent | e3b4b3875a6d8c7857ba948a662ace4731913ecf (diff) | |
| parent | 2cdfb170216c798c637081b0e28ec8921f0b777b (diff) | |
Automated merge with http://bitbucket.org/lindenlab/viewer-development
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 |