diff options
| author | Richard Linden <none@none> | 2013-10-24 14:42:00 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-10-24 14:42:00 -0700 |
| commit | 371198289b2e3f5894071483968d5e0fa7a4ceeb (patch) | |
| tree | 39c8962bf5a08a5aad2cdde07752e0a6337b16c4 /indra/llcommon/lltrace.h | |
| parent | 066182bf064d74c84313220dba3a10a3c318d634 (diff) | |
| parent | d13f26a6fcde03f5464e986b204b2fbb5848d861 (diff) | |
Automated merge with http://bitbucket.org/lindenlab/viewer-interesting
Diffstat (limited to 'indra/llcommon/lltrace.h')
| -rw-r--r-- | indra/llcommon/lltrace.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llcommon/lltrace.h b/indra/llcommon/lltrace.h index b499036af2..8b67dd8f44 100644 --- a/indra/llcommon/lltrace.h +++ b/indra/llcommon/lltrace.h @@ -69,10 +69,10 @@ protected: template<typename ACCUMULATOR> class StatType : public StatBase, - public LLInstanceTracker<StatType<ACCUMULATOR>, std::string, InstanceTrackerAllowKeyCollisions> + public LLInstanceTracker<StatType<ACCUMULATOR>, std::string, LLInstanceTrackerAllowKeyCollisions> { public: - typedef LLInstanceTracker<StatType<ACCUMULATOR>, std::string, InstanceTrackerAllowKeyCollisions> instance_tracker_t; + typedef LLInstanceTracker<StatType<ACCUMULATOR>, std::string, LLInstanceTrackerAllowKeyCollisions> instance_tracker_t; StatType(const char* name, const char* description) : instance_tracker_t(name), StatBase(name, description), |