summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2011-05-06 13:40:12 -0500
committerDave Parks <davep@lindenlab.com>2011-05-06 13:40:12 -0500
commit57c8e9893e3138cf6245b6416c73900e650801dd (patch)
tree10f39624f6359e2d6b9c531a1c4a3c3003f8e894 /indra
parenta6a842614722e4cec8628925367dcf77e230ba9f (diff)
parentc591ea35ac9a31b79ffc803486bce70bbde78889 (diff)
Automated merge with https://bitbucket.org/davep/mesh-candidate-storm-1210
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/llappviewerwin32.cpp6
1 files changed, 0 insertions, 6 deletions
diff --git a/indra/newview/llappviewerwin32.cpp b/indra/newview/llappviewerwin32.cpp
index 54689ea808..6396ca91ff 100644
--- a/indra/newview/llappviewerwin32.cpp
+++ b/indra/newview/llappviewerwin32.cpp
@@ -26,12 +26,6 @@
#include "llviewerprecompiledheaders.h"
-#if defined(_DEBUG)
-# if _MSC_VER >= 1400 // Visual C++ 2005 or later
-# define WINDOWS_CRT_MEM_CHECKS 1
-# endif
-#endif
-
#include "llappviewerwin32.h"
#include "llmemtype.h"