diff options
Diffstat (limited to 'indra/llcommon')
| -rw-r--r-- | indra/llcommon/linden_common.h | 1 | ||||
| -rw-r--r-- | indra/llcommon/llsys.cpp | 3 | ||||
| -rw-r--r-- | indra/llcommon/llversionviewer.h | 4 |
3 files changed, 5 insertions, 3 deletions
diff --git a/indra/llcommon/linden_common.h b/indra/llcommon/linden_common.h index 504552a9d2..9ee4d1159e 100644 --- a/indra/llcommon/linden_common.h +++ b/indra/llcommon/linden_common.h @@ -62,6 +62,7 @@ #pragma warning (disable : 4100) // unreferenced formal parameter #pragma warning (disable : 4127) // conditional expression is constant (e.g. while(1) ) #pragma warning (disable : 4244) // possible loss of data on conversions +#pragma warning (disable : 4396) // the inline specifier cannot be used when a friend declaration refers to a specialization of a function template #pragma warning (disable : 4512) // assignment operator could not be generated #pragma warning (disable : 4706) // assignment within conditional (even if((x = y)) ) #endif // LL_WINDOWS diff --git a/indra/llcommon/llsys.cpp b/indra/llcommon/llsys.cpp index 7346b29fb1..98393dacd1 100644 --- a/indra/llcommon/llsys.cpp +++ b/indra/llcommon/llsys.cpp @@ -679,7 +679,8 @@ BOOL gunzip_file(const char *srcfile, const char *dstfile) size_t nwrit = fwrite(buffer, sizeof(U8), bytes, dst); if (nwrit < (size_t) bytes) { - llerrs << "Short write on " << tmpfile << llendl; + llwarns << "Short write on " << tmpfile << ": Wrote " << nwrit << " of " << bytes << " bytes." << llendl; + goto err; } } while(gzeof(src) == 0); fclose(dst); diff --git a/indra/llcommon/llversionviewer.h b/indra/llcommon/llversionviewer.h index 65db226ff9..02b956d86c 100644 --- a/indra/llcommon/llversionviewer.h +++ b/indra/llcommon/llversionviewer.h @@ -34,8 +34,8 @@ const S32 LL_VERSION_MAJOR = 1; const S32 LL_VERSION_MINOR = 19; -const S32 LL_VERSION_PATCH = 0; -const S32 LL_VERSION_BUILD = 5; +const S32 LL_VERSION_PATCH = 1; +const S32 LL_VERSION_BUILD = 0; const char * const LL_CHANNEL = "Second Life Release"; |