diff --git a/indra/llcommon/llapr.cpp b/indra/llcommon/llapr.cpp index 7e3a26c0d..d2dda36f6 100644 --- a/indra/llcommon/llapr.cpp +++ b/indra/llcommon/llapr.cpp @@ -396,7 +396,12 @@ apr_status_t LLAPRFile::open(std::string const& filename, apr_int32_t flags, acc // File I/O S32 LLAPRFile::read(void *buf, S32 nbytes) { - llassert_always(mFile) ; + //llassert_always(mFile); (ASC-TUDCC) -HgB + if(!mFile) + { + llwarns << "apr mFile is removed by somebody else. Can not write." << llendl ; + return 0; + } apr_size_t sz = nbytes; apr_status_t s = apr_file_read(mFile, buf, &sz); @@ -414,7 +419,12 @@ S32 LLAPRFile::read(void *buf, S32 nbytes) S32 LLAPRFile::write(const void *buf, S32 nbytes) { - llassert_always(mFile) ; + // llassert_always(mFile); (ASC-TUDCC) -HgB + if(!mFile) + { + llwarns << "apr mFile is removed by somebody else. Can not write." << llendl ; + return 0; + } apr_size_t sz = nbytes; apr_status_t s = apr_file_write(mFile, buf, &sz); diff --git a/indra/llcommon/llversionviewer.h b/indra/llcommon/llversionviewer.h index f29c11a00..c43395731 100644 --- a/indra/llcommon/llversionviewer.h +++ b/indra/llcommon/llversionviewer.h @@ -36,7 +36,7 @@ const S32 LL_VERSION_MAJOR = 1; const S32 LL_VERSION_MINOR = 4; const S32 LL_VERSION_PATCH = 2; -const S32 LL_VERSION_BUILD = 7; +const S32 LL_VERSION_BUILD = 8; const char * const LL_CHANNEL = "Ascent Viewer Release";