diff options
| author | Jacek Antonelli | 2008-10-17 20:01:38 -0500 |
|---|---|---|
| committer | Jacek Antonelli | 2008-10-17 20:01:38 -0500 |
| commit | fdf944fb0355249d73c4e25ee86e9ffd378e7d4b (patch) | |
| tree | 2e5c51fe0e6d5757f984721e01cc097801d927e7 /linden/indra/newview/llappviewerwin32.cpp | |
| parent | Rebranded Windows-specific installer/support files. (diff) | |
| parent | Updated source to SL version 1.21.6. (diff) | |
| download | meta-impy-fdf944fb0355249d73c4e25ee86e9ffd378e7d4b.zip meta-impy-fdf944fb0355249d73c4e25ee86e9ffd378e7d4b.tar.gz meta-impy-fdf944fb0355249d73c4e25ee86e9ffd378e7d4b.tar.bz2 meta-impy-fdf944fb0355249d73c4e25ee86e9ffd378e7d4b.tar.xz | |
Merge branch 'merge-1.21.6' into rebranding
Conflicts:
linden/indra/newview/installers/windows/installer_template.nsi
linden/indra/newview/llappviewer.cpp
Diffstat (limited to 'linden/indra/newview/llappviewerwin32.cpp')
| -rw-r--r-- | linden/indra/newview/llappviewerwin32.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/linden/indra/newview/llappviewerwin32.cpp b/linden/indra/newview/llappviewerwin32.cpp index 07f3ece..9f37534 100644 --- a/linden/indra/newview/llappviewerwin32.cpp +++ b/linden/indra/newview/llappviewerwin32.cpp | |||
| @@ -32,7 +32,9 @@ | |||
| 32 | #include "llviewerprecompiledheaders.h" | 32 | #include "llviewerprecompiledheaders.h" |
| 33 | 33 | ||
| 34 | #if defined(_DEBUG) | 34 | #if defined(_DEBUG) |
| 35 | # define WINDOWS_CRT_MEM_CHECKS 1 | 35 | # if _MSC_VER >= 1400 // Visual C++ 2005 or later |
| 36 | # define WINDOWS_CRT_MEM_CHECKS 1 | ||
| 37 | # endif | ||
| 36 | #endif | 38 | #endif |
| 37 | 39 | ||
| 38 | #include "llappviewerwin32.h" | 40 | #include "llappviewerwin32.h" |