diff options
| author | Richard Linden <none@none> | 2013-10-07 13:38:48 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-10-07 13:38:48 -0700 |
| commit | 2eeee8a9491398697a8f3167bc4f715a3970fc3a (patch) | |
| tree | 1ec811f4a0529edc415c32fb7ec3e6a9406cff2f /indra/llcommon/lltrace.cpp | |
| parent | c430673b95823f688c45d0fbda4198595bb41073 (diff) | |
| parent | 17df8988fec3f2ba991ca9e34ff8148253a2fc04 (diff) | |
Automated merge with http://bitbucket.org/lindenlab/viewer-interesting
Diffstat (limited to 'indra/llcommon/lltrace.cpp')
| -rw-r--r-- | indra/llcommon/lltrace.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llcommon/lltrace.cpp b/indra/llcommon/lltrace.cpp index 73846ba900..1ad31cacfe 100644 --- a/indra/llcommon/lltrace.cpp +++ b/indra/llcommon/lltrace.cpp @@ -35,7 +35,7 @@ namespace LLTrace MemStatHandle gTraceMemStat("LLTrace"); -TraceBase::TraceBase( const char* name, const char* description ) +StatBase::StatBase( const char* name, const char* description ) : mName(name), mDescription(description ? description : "") { @@ -47,7 +47,7 @@ TraceBase::TraceBase( const char* name, const char* description ) #endif } -const char* TraceBase::getUnitLabel() const +const char* StatBase::getUnitLabel() const { return ""; } |