summaryrefslogtreecommitdiff
path: root/indra/llcommon/llrefcount.cpp
diff options
context:
space:
mode:
authorAndrey Lihatskiy <alihatskiy@productengine.com>2022-05-26 02:56:29 +0300
committerAndrey Lihatskiy <alihatskiy@productengine.com>2022-05-26 02:56:29 +0300
commit2ed401882e5ee28415c2ec70e6391855c006769f (patch)
tree7f433f9a6dc6751618c7271337a7e84f685e5727 /indra/llcommon/llrefcount.cpp
parent23d310436a664f7303d627095f8972de6cb17334 (diff)
parentcdbd06e8ed6e3f4285a61f5c0b607a65dfdf8dfd (diff)
Merge branch 'master' into DRTVWR-483
# Conflicts: # indra/newview/llviewertexturelist.cpp
Diffstat (limited to 'indra/llcommon/llrefcount.cpp')
-rw-r--r--indra/llcommon/llrefcount.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/llcommon/llrefcount.cpp b/indra/llcommon/llrefcount.cpp
index 29a5ca6f24..5cbd346411 100644
--- a/indra/llcommon/llrefcount.cpp
+++ b/indra/llcommon/llrefcount.cpp
@@ -29,6 +29,9 @@
#include "llerror.h"
+// maximum reference count before sounding memory leak alarm
+const S32 gMaxRefCount = 65536;
+
LLRefCount::LLRefCount(const LLRefCount& other)
: mRef(0)
{
@@ -47,7 +50,7 @@ LLRefCount::LLRefCount() :
LLRefCount::~LLRefCount()
{
- if (mRef != 0)
+ if (mRef != LL_REFCOUNT_FREE && mRef != 0)
{
LL_ERRS() << "deleting non-zero reference" << LL_ENDL;
}