Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

HI N3XI5 ILU

Browse Source 
Signed-off-by: Beeks <HgDelirium@gmail.com>
This commit is contained in:
Beeks
2010-09-28 22:31:44 -04:00
parent 6ab2f45f99
commit 40af53fddc
2 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
indra/llcommon/llapr.cpp
View File

@@ -396,7 +396,12 @@ apr_status_t LLAPRFile::open(std::string const& filename, apr_int32_t flags, acc
// File I/O // File I/O
S32 LLAPRFile::read(void *buf, S32 nbytes) 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_size_t sz = nbytes;
apr_status_t s = apr_file_read(mFile, buf, &sz); 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) 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_size_t sz = nbytes;
apr_status_t s = apr_file_write(mFile, buf, &sz); apr_status_t s = apr_file_write(mFile, buf, &sz);

2
indra/llcommon/llversionviewer.h
View File

@@ -36,7 +36,7 @@
const S32 LL_VERSION_MAJOR = 1; const S32 LL_VERSION_MAJOR = 1;
const S32 LL_VERSION_MINOR = 4; const S32 LL_VERSION_MINOR = 4;
const S32 LL_VERSION_PATCH = 2; 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"; const char * const LL_CHANNEL = "Ascent Viewer Release";