summaryrefslogtreecommitdiff
path: root/indra/llcommon
diff options
context:
space:
mode:
authordolphin <dolphin@lindenlab.com>2013-09-18 15:58:54 -0700
committerdolphin <dolphin@lindenlab.com>2013-09-18 15:58:54 -0700
commitd9ad2d3a13b4bb15ab5e56fd04970abc03e100e7 (patch)
tree39178dd2b0ab11d754b57b492b4835b926a538c6 /indra/llcommon
parentc8144f7405178621f779b814fd4cb3e632786e0a (diff)
parentad777b46d0fe5d790e43efb1771e9f64f3ad3dfb (diff)
Merge with 3.6.6-release
Diffstat (limited to 'indra/llcommon')
-rwxr-xr-xindra/llcommon/llapr.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llcommon/llapr.cpp b/indra/llcommon/llapr.cpp
index a0802c6adf..b7815b0e35 100755
--- a/indra/llcommon/llapr.cpp
+++ b/indra/llcommon/llapr.cpp
@@ -226,7 +226,7 @@ void LLVolatileAPRPool::clearVolatileAPRPool()
llassert_always(mNumActiveRef > 0) ;
}
- llassert(mNumTotalRef < (FULL_VOLATILE_APR_POOL << 2)) ;
+ llassert(mNumTotalRef <= (FULL_VOLATILE_APR_POOL << 2)) ;
}
BOOL LLVolatileAPRPool::isFull()