diff options
Diffstat (limited to 'indra/llcommon/linden_common.h')
| -rw-r--r-- | indra/llcommon/linden_common.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/llcommon/linden_common.h b/indra/llcommon/linden_common.h index 9ee4d1159e..60ea21d642 100644 --- a/indra/llcommon/linden_common.h +++ b/indra/llcommon/linden_common.h @@ -45,9 +45,10 @@ #include <iostream> #include <fstream> -// Work around stupid Microsoft STL warning +// Work Microsoft compiler warnings #ifdef LL_WINDOWS -#pragma warning (disable : 4702) // warning C4702: unreachable code +#pragma warning (disable : 4702) // unreachable code +#pragma warning (disable : 4244) // conversion from time_t to S32 #endif // LL_WINDOWS #include <algorithm> |