diff options
| author | Richard Linden <none@none> | 2011-12-08 11:02:00 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2011-12-08 11:02:00 -0800 |
| commit | dd9263d01780fe23b8c329e0fd8d8c140b04c174 (patch) | |
| tree | 53f8c1fc6d299576d82b7932079ea0c4d6910990 /indra/llprimitive/llmodel.cpp | |
| parent | 9fbee8bd46e1fae770deedb960701899a8e18b84 (diff) | |
| parent | 1231c86d2fc1f4a93c97e9c42e58c917f71b6718 (diff) | |
Automated merge with http://hg.secondlife.com/viewer-development
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> |