diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2009-09-30 21:42:04 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2009-09-30 21:42:04 -0400 |
| commit | eca30a22626b9a3e68e0e55f8da75614cd60d713 (patch) | |
| tree | d27f30f138553c1f0fbc0e61ef0d2ae036d54662 /indra/llcommon/llallocator_heap_profile.cpp | |
| parent | bc4444cd78067cbf11d3ffb210375a31a33f96bd (diff) | |
| parent | 3f05d552fec9d4d9a17c9131f445a7db0eef561f (diff) | |
QAR-1619: merge up to 2009-09-26 viewer/viewer-20
Diffstat (limited to 'indra/llcommon/llallocator_heap_profile.cpp')
| -rw-r--r-- | indra/llcommon/llallocator_heap_profile.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/llcommon/llallocator_heap_profile.cpp b/indra/llcommon/llallocator_heap_profile.cpp index d82ee9ed81..0a807702d0 100644 --- a/indra/llcommon/llallocator_heap_profile.cpp +++ b/indra/llcommon/llallocator_heap_profile.cpp @@ -38,6 +38,7 @@ // disable warning about boost::lexical_cast returning uninitialized data // when it fails to parse the string #pragma warning (disable:4701) +#pragma warning (disable:4702) #endif #include <boost/algorithm/string/split.hpp> |