summaryrefslogtreecommitdiff
path: root/indra/llcommon/llpreprocessor.h
diff options
context:
space:
mode:
authorSteven Bennetts <steve@lindenlab.com>2007-03-07 02:48:44 +0000
committerSteven Bennetts <steve@lindenlab.com>2007-03-07 02:48:44 +0000
commit068558f888446691ebbb3df2105948e0d50300a5 (patch)
tree5224e0fa3e627bc9018af9660198ef15b19c5487 /indra/llcommon/llpreprocessor.h
parentc4059553afa289f51f9966b4283b2a62b7103303 (diff)
merge release@58791 vc8@58828 -> release
Adds Dev Studio 2005 (VC8) Reviewed by Rob
Diffstat (limited to 'indra/llcommon/llpreprocessor.h')
-rw-r--r--indra/llcommon/llpreprocessor.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/llcommon/llpreprocessor.h b/indra/llcommon/llpreprocessor.h
index f4e24025d5..8fa171c482 100644
--- a/indra/llcommon/llpreprocessor.h
+++ b/indra/llcommon/llpreprocessor.h
@@ -93,6 +93,7 @@
#pragma warning( disable : 4284 ) // silly MS warning deep inside their <map> include file
#pragma warning( disable : 4503 ) // 'decorated name length exceeded, name was truncated'. Does not seem to affect compilation.
#pragma warning( disable : 4800 ) // 'BOOL' : forcing value to bool 'true' or 'false' (performance warning)
+#pragma warning( disable : 4996 ) // warning: deprecated
#endif // LL_WINDOWS
#endif // not LL_LINDEN_PREPROCESSOR_H