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/llcommon | |
| parent | ec6893db5099b1e95802254277de0cc2e9bea83c (diff) | |
| parent | adeb71d98279fc4e8af7859cd36114be9f95e6da (diff) | |
Merge with viewer-experience
Diffstat (limited to 'indra/llcommon')
| -rw-r--r-- | indra/llcommon/llpreprocessor.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/llcommon/llpreprocessor.h b/indra/llcommon/llpreprocessor.h index 17a4287538..31d5f3d2c7 100644 --- a/indra/llcommon/llpreprocessor.h +++ b/indra/llcommon/llpreprocessor.h @@ -151,6 +151,7 @@ #pragma warning (disable : 4251) // member needs to have dll-interface to be used by clients of class #pragma warning (disable : 4275) // non dll-interface class used as base for dll-interface class +#pragma warning (disable : 4018) // '<' : signed/unsigned mismatch #endif // LL_MSVC #if LL_WINDOWS |