diff --git a/indra/llcommon/llapr.cpp b/indra/llcommon/llapr.cpp index d2dda36f6..f62a3ea88 100644 --- a/indra/llcommon/llapr.cpp +++ b/indra/llcommon/llapr.cpp @@ -91,13 +91,12 @@ void ll_cleanup_apr() // //LLAPRPool // -LLAPRPool::LLAPRPool(apr_pool_t *parent, apr_size_t size, BOOL releasePoolFlag) -{ - mParent = parent ; - mReleasePoolFlag = releasePoolFlag ; - mMaxSize = size ; - mPool = NULL ; - +LLAPRPool::LLAPRPool(apr_pool_t *parent, apr_size_t size, BOOL releasePoolFlag) + : mParent(parent), + mReleasePoolFlag(releasePoolFlag), + mMaxSize(size), + mPool(NULL) +{ createAPRPool() ; } @@ -399,7 +398,7 @@ S32 LLAPRFile::read(void *buf, S32 nbytes) //llassert_always(mFile); (ASC-TUDCC) -HgB if(!mFile) { - llwarns << "apr mFile is removed by somebody else. Can not write." << llendl ; + llwarns << "apr mFile is removed by somebody else. Can not read." << llendl ; return 0; } diff --git a/indra/llcommon/llfile.cpp b/indra/llcommon/llfile.cpp index 2a76f7fb8..71a2df48f 100644 --- a/indra/llcommon/llfile.cpp +++ b/indra/llcommon/llfile.cpp @@ -324,7 +324,12 @@ void llofstream::close() if(is_open()) { if (_Filebuffer->close() == 0) + { _Myios::setstate(ios_base::failbit); /*Flawfinder: ignore*/ + } + delete _Filebuffer; + _Filebuffer = NULL; + _ShouldClose = false; } } diff --git a/indra/llcommon/metapropertyt.h b/indra/llcommon/metapropertyt.h index 79a536a22..5ad230d1d 100644 --- a/indra/llcommon/metapropertyt.h +++ b/indra/llcommon/metapropertyt.h @@ -93,6 +93,13 @@ inline const LLReflective* LLMetaPropertyT::get(const LLReflective* obje return NULL; } +template <> +inline const LLReflective* LLMetaPropertyT::get(const LLReflective* object) const +{ + checkObjectClass(object); + return NULL; +} + template <> inline LLSD LLMetaPropertyT::getLLSD(const LLReflective* object) const { @@ -111,6 +118,12 @@ inline LLSD LLMetaPropertyT::getLLSD(const LLReflective* object) const return *(getProperty(object)); } +template <> +inline LLSD LLMetaPropertyT::getLLSD(const LLReflective* object) const +{ + return *(getProperty(object)); +} + template class LLMetaPropertyTT : public LLMetaPropertyT { diff --git a/indra/llinventory/llpermissions.cpp b/indra/llinventory/llpermissions.cpp index 328ed4588..c22564d95 100644 --- a/indra/llinventory/llpermissions.cpp +++ b/indra/llinventory/llpermissions.cpp @@ -943,6 +943,8 @@ void LLMetaClassT::reflectProperties(LLMetaClass& meta_class) { reflectProperty(meta_class, "mCreator", &LLPermissions::mCreator); reflectProperty(meta_class, "mOwner", &LLPermissions::mOwner); + reflectProperty(meta_class, "mGroup", &LLPermissions::mGroup); + reflectProperty(meta_class, "mIsGroupOwned", &LLPermissions::mIsGroupOwned); } // virtual