diff options
| author | Steve Bennetts <steve@lindenlab.com> | 2009-10-19 12:57:25 -0700 |
|---|---|---|
| committer | Steve Bennetts <steve@lindenlab.com> | 2009-10-19 12:57:25 -0700 |
| commit | 9fc74de1a18bbb209ee2524b0c833b3016ffc5e3 (patch) | |
| tree | 134b4ef690e12793dbfe60167625b65dcec6e996 /indra/llcommon/llallocator_heap_profile.cpp | |
| parent | 0d6f1d125eb0f6de766d617978a022fc74b4aec7 (diff) | |
| parent | 909e784deb73d1da73928448cddb219af42ada93 (diff) | |
merge
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> |