diff options
author | palange <palange@lindenlab.com> | 2009-10-12 19:03:52 -0400 |
---|---|---|
committer | palange <palange@lindenlab.com> | 2009-10-12 19:03:52 -0400 |
commit | dbe7135cc4694e906a7d95a935df70f20514c962 (patch) | |
tree | 227ed3c9bc717171aeb009067e0f07335bcee8c3 /indra/llcommon/llallocator_heap_profile.cpp | |
parent | d4b2897700c66354413af42ab055bd1aaa47f91c (diff) | |
parent | e3a4e3dc10a96b0822674cea262f41774e55a660 (diff) |
merge of login-api
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> |