From ce7682c2a468e926d6b38e4f95bd289a8d26222c Mon Sep 17 00:00:00 2001 From: Bryan O'Sullivan Date: Wed, 18 Jul 2007 21:22:40 +0000 Subject: svn merge -r64837:65485 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release (only inside indra) (josh) Original log message was: svn merge -r64837:65485 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance bos updated it to be: svn merge -r64837:65269 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance However, it appears it actually was: svn merge -r64837:65485 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance ... missing some file additions. --- indra/lscript/lscript_compile/indra.y | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'indra/lscript/lscript_compile') diff --git a/indra/lscript/lscript_compile/indra.y b/indra/lscript/lscript_compile/indra.y index c7a4fd6289..49d0c38b30 100644 --- a/indra/lscript/lscript_compile/indra.y +++ b/indra/lscript/lscript_compile/indra.y @@ -15,6 +15,10 @@ #define getenv getenv_workaround #endif + #ifdef LL_WINDOWS + #pragma warning( disable : 4065 ) // warning: switch statement contains 'default' but no 'case' labels + #endif + #ifdef __cplusplus } #endif -- cgit v1.2.3