diff options
author | Steve Bennetts <steve@lindenlab.com> | 2009-10-21 18:49:19 -0700 |
---|---|---|
committer | Steve Bennetts <steve@lindenlab.com> | 2009-10-21 18:49:19 -0700 |
commit | 642d368eccd662494a4958a50ba2bd3301b5207e (patch) | |
tree | 0aaa9d2981260051009e765a6171ad328f031183 /indra/newview/llvoavatar.cpp | |
parent | c7786aa5b614d1c88359bacbe9bd447f5acdd84c (diff) | |
parent | e25395e10f5abbed1ed7bc3e4a7fc892070ddc50 (diff) |
merge
Diffstat (limited to 'indra/newview/llvoavatar.cpp')
-rw-r--r-- | indra/newview/llvoavatar.cpp | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp index 1ec72df53c..0dcd164d83 100644 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp @@ -30,6 +30,12 @@ * $/LicenseInfo$ */ +#if LL_MSVC +// disable warning about boost::lexical_cast returning uninitialized data +// when it fails to parse the string +#pragma warning (disable:4701) +#endif + #include "llviewerprecompiledheaders.h" #include "llvoavatar.h" @@ -86,7 +92,12 @@ #include "llvoiceclient.h" #include "llvoicevisualizer.h" // Ventrella -#include "boost/lexical_cast.hpp" +#if LL_MSVC +// disable boost::lexical_cast warning +#pragma warning (disable:4702) +#endif + +#include <boost/lexical_cast.hpp> using namespace LLVOAvatarDefines; |