diff options
| author | brad kittenbrink <brad@lindenlab.com> | 2009-10-07 17:51:28 -0700 |
|---|---|---|
| committer | brad kittenbrink <brad@lindenlab.com> | 2009-10-07 17:51:28 -0700 |
| commit | 50247533f99f374be71728cc5ca00f0444189a9f (patch) | |
| tree | c1505ec3ec9c054447fb98968c9299e502857000 /indra/llcommon/llallocator_heap_profile.cpp | |
| parent | 146e084af3344ada737340115c5fa063c0aab6b3 (diff) | |
| parent | d885db79f94ee3d6a2b4ed7febe7beb69d0c7d51 (diff) | |
Merged latest viewer/login-api with latest 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> |