diff options
| author | Leslie Linden <leslie@lindenlab.com> | 2011-11-29 10:40:45 -0800 |
|---|---|---|
| committer | Leslie Linden <leslie@lindenlab.com> | 2011-11-29 10:40:45 -0800 |
| commit | e919349054c8ae80a054f047756e6596b58a3e13 (patch) | |
| tree | 4d2abc589c448fe2b54f7be09385e644fd5b87af /indra/llprimitive | |
| parent | ec6893db5099b1e95802254277de0cc2e9bea83c (diff) | |
| parent | adeb71d98279fc4e8af7859cd36114be9f95e6da (diff) | |
Merge with viewer-experience
Diffstat (limited to 'indra/llprimitive')
| -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> |