diff options
| author | Merov Linden <merov@lindenlab.com> | 2011-11-28 20:39:39 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2011-11-28 20:39:39 -0800 |
| commit | e3afa4e547d54805ee9a54502c0f6ee1b31586ef (patch) | |
| tree | d114905196c43cd58d76ba9ec2e6602fdd605d0f /indra/llprimitive/llmodel.cpp | |
| parent | 3001ad1a02f85e5e4f902e4a5973d4ccfcc689bb (diff) | |
| parent | d089e6c26452a61fa3b33b71735bc39d90701865 (diff) | |
Pull from viewer-experience
Diffstat (limited to 'indra/llprimitive/llmodel.cpp')
| -rw-r--r-- | indra/llprimitive/llmodel.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/indra/llprimitive/llmodel.cpp b/indra/llprimitive/llmodel.cpp index 6e4bb7ec97..cb32a510b8 100644 --- a/indra/llprimitive/llmodel.cpp +++ b/indra/llprimitive/llmodel.cpp @@ -31,11 +31,18 @@ #include "llconvexdecomposition.h" #include "llsdserialize.h" #include "llvector4a.h" - +#if LL_MSVC +#pragma warning (disable : 4263) +#pragma warning (disable : 4264) +#endif #include "dae.h" #include "dae/daeErrorHandler.h" #include "dom/domConstants.h" #include "dom/domMesh.h" +#if LL_MSVC +#pragma warning (default : 4263) +#pragma warning (default : 4264) +#endif #ifdef LL_STANDALONE # include <zlib.h> |