diff options
| author | Richard Linden <none@none> | 2013-10-17 14:23:56 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-10-17 14:23:56 -0700 |
| commit | 1beaedacadc8093c9df612992a873f9c89354bce (patch) | |
| tree | a056537b11fb577b7dee9ed236a2616eb0989d9d /indra/llcommon/lltrace.h | |
| parent | 1c26d4265666cd232d38724ad6f1e32fd2dc2d34 (diff) | |
moved root timer to global variable
added flag to LLInstanceTracker to allow multiple values per key
made StatType allow multiple values per key to eliminate block timer related crash
Diffstat (limited to 'indra/llcommon/lltrace.h')
| -rw-r--r-- | indra/llcommon/lltrace.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/llcommon/lltrace.h b/indra/llcommon/lltrace.h index cbdf4e4a6f..b499036af2 100644 --- a/indra/llcommon/lltrace.h +++ b/indra/llcommon/lltrace.h @@ -69,11 +69,12 @@ protected: template<typename ACCUMULATOR> class StatType : public StatBase, - public LLInstanceTracker<StatType<ACCUMULATOR>, std::string> + public LLInstanceTracker<StatType<ACCUMULATOR>, std::string, InstanceTrackerAllowKeyCollisions> { public: + typedef LLInstanceTracker<StatType<ACCUMULATOR>, std::string, InstanceTrackerAllowKeyCollisions> instance_tracker_t; StatType(const char* name, const char* description) - : LLInstanceTracker<StatType<ACCUMULATOR>, std::string>(name), + : instance_tracker_t(name), StatBase(name, description), mAccumulatorIndex(AccumulatorBuffer<ACCUMULATOR>::getDefaultBuffer()->reserveSlot()) {} |