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/llcommon | |
| parent | 3001ad1a02f85e5e4f902e4a5973d4ccfcc689bb (diff) | |
| parent | d089e6c26452a61fa3b33b71735bc39d90701865 (diff) | |
Pull from 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 |