diff options
author | Oz Linden <oz@lindenlab.com> | 2013-06-17 16:50:35 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2013-06-17 16:50:35 -0400 |
commit | 761bf254a4e72ec521ff1a52ac12f8594a350818 (patch) | |
tree | c72f84bb4ac319c10299a35934b52a09a73a127d /indra/llcommon/llapr.cpp | |
parent | a2fa9a2bc26bb67c0bb952d3295c380dcb853eb5 (diff) | |
parent | 1e41b017e1713a35eb68190d279cf8d28791b6d2 (diff) |
merge changes for 3.6.0-release
Diffstat (limited to 'indra/llcommon/llapr.cpp')
-rwxr-xr-x | indra/llcommon/llapr.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/indra/llcommon/llapr.cpp b/indra/llcommon/llapr.cpp index d1c44c9403..a0802c6adf 100755 --- a/indra/llcommon/llapr.cpp +++ b/indra/llcommon/llapr.cpp @@ -226,9 +226,7 @@ void LLVolatileAPRPool::clearVolatileAPRPool() llassert_always(mNumActiveRef > 0) ; } - //paranoia check if the pool is jammed. - //will remove the check before going to release. - llassert_always(mNumTotalRef < (FULL_VOLATILE_APR_POOL << 2)) ; + llassert(mNumTotalRef < (FULL_VOLATILE_APR_POOL << 2)) ; } BOOL LLVolatileAPRPool::isFull() |