diff options
Diffstat (limited to 'indra')
| -rw-r--r--[-rwxr-xr-x] | indra/newview/llavatariconctrl.cpp | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | indra/newview/llmeshrepository.cpp | 0 | ||||
| -rw-r--r-- | indra/test/test.cpp | 8 |
3 files changed, 8 insertions, 0 deletions
diff --git a/indra/newview/llavatariconctrl.cpp b/indra/newview/llavatariconctrl.cpp index b539ac38ed..b539ac38ed 100755..100644 --- a/indra/newview/llavatariconctrl.cpp +++ b/indra/newview/llavatariconctrl.cpp diff --git a/indra/newview/llmeshrepository.cpp b/indra/newview/llmeshrepository.cpp index b02bf79a28..b02bf79a28 100755..100644 --- a/indra/newview/llmeshrepository.cpp +++ b/indra/newview/llmeshrepository.cpp diff --git a/indra/test/test.cpp b/indra/test/test.cpp index 3e7be29b39..1adcfb6f45 100644 --- a/indra/test/test.cpp +++ b/indra/test/test.cpp @@ -54,8 +54,16 @@ #include <gtest/gtest.h> #endif +#if LL_MSVC +#pragma warning (push) +#pragma warning (disable : 4702) // warning C4702: unreachable code +#endif #include <boost/iostreams/tee.hpp> #include <boost/iostreams/stream.hpp> +#if LL_MSVC +#pragma warning (pop) +#endif + #include <boost/shared_ptr.hpp> #include <boost/make_shared.hpp> #include <boost/foreach.hpp> |