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/newview/llvoavatar.cpp | |
| parent | d4b2897700c66354413af42ab055bd1aaa47f91c (diff) | |
| parent | e3a4e3dc10a96b0822674cea262f41774e55a660 (diff) | |
merge of login-api
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 60d64d50b9..a9e9169891 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; |