diff options
| author | Dave Parks <davep@lindenlab.com> | 2012-07-30 12:20:16 -0500 | 
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2012-07-30 12:20:16 -0500 | 
| commit | 267c01d4c8724adcfa9a9603d24e13cce037f89f (patch) | |
| tree | 603dc47ad78b098f26dbef0dec99b598c663f989 /indra | |
| parent | 49879c254cfc58b34a003d34be102c3e51eb0037 (diff) | |
MAINT-570 Fix for linux build.
Diffstat (limited to 'indra')
| -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 | 
