diff options
author | Richard Linden <none@none> | 2013-09-19 20:05:53 -0700 |
---|---|---|
committer | Richard Linden <none@none> | 2013-09-19 20:05:53 -0700 |
commit | 05ec5ca3d592ed7c730026582a2573d04c6e4c16 (patch) | |
tree | b486498f179ae1fa74933f4e9391e318e38535de /indra/llcommon | |
parent | 448f5b42a071a88d5e3031538bcf60102c99af89 (diff) |
BUILDFIX: forgot forward declaration
better overrides for memclaim and memdisclaim of sizes
added occlusion stats to stats floater
stats now render range instead of mean
Diffstat (limited to 'indra/llcommon')
-rw-r--r-- | indra/llcommon/lltrace.h | 8 | ||||
-rw-r--r-- | indra/llcommon/lltracerecording.h | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/indra/llcommon/lltrace.h b/indra/llcommon/lltrace.h index 49ee252014..bf1119d694 100644 --- a/indra/llcommon/lltrace.h +++ b/indra/llcommon/lltrace.h @@ -512,14 +512,14 @@ public: return value; } - const size_t& memClaim(const size_t& size) + size_t& memClaim(size_t& size) { claim_mem(sMemStat, size); mMemFootprint += size; return size; } - size_t& memClaim(size_t& size) + int& memClaim(int& size) { claim_mem(sMemStat, size); mMemFootprint += size; @@ -541,14 +541,14 @@ public: return value; } - const size_t& memDisclaim(const size_t& size) + size_t& memDisclaim(size_t& size) { disclaim_mem(sMemStat, size); mMemFootprint -= size; return size; } - size_t& memDisclaim(size_t& size) + int& memDisclaim(int& size) { disclaim_mem(sMemStat, size); mMemFootprint -= size; diff --git a/indra/llcommon/lltracerecording.h b/indra/llcommon/lltracerecording.h index edda0f3a8c..2f5cefa8eb 100644 --- a/indra/llcommon/lltracerecording.h +++ b/indra/llcommon/lltracerecording.h @@ -124,6 +124,8 @@ namespace LLTrace template<typename T> class EventStatHandle; + class MemStatHandle; + template<typename T> struct RelatedTypes { |