diff options
| author | Richard Linden <none@none> | 2013-07-19 11:28:37 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-07-19 11:28:37 -0700 |
| commit | eb8d552df76540e7b0b533f0c10c5faa541299a4 (patch) | |
| tree | 43b530f5c5eb0ea545251047d1a5c398803a46b3 /indra/llcommon | |
| parent | 075a7bcc980b0ca0d2888d344b6afa8ab5b52d85 (diff) | |
| parent | 29930baf23fbd8cd147cd78f60d01496479ae78e (diff) | |
Automated merge with https://bitbucket.org/lindenlab/viewer-interesting
Diffstat (limited to 'indra/llcommon')
| -rw-r--r-- | indra/llcommon/lltracerecording.cpp | 1 | ||||
| -rw-r--r-- | indra/llcommon/llunit.h | 13 |
2 files changed, 13 insertions, 1 deletions
diff --git a/indra/llcommon/lltracerecording.cpp b/indra/llcommon/lltracerecording.cpp index 5d43771cb2..48b5a7c3fa 100644 --- a/indra/llcommon/lltracerecording.cpp +++ b/indra/llcommon/lltracerecording.cpp @@ -41,7 +41,6 @@ namespace LLTrace Recording::Recording(EPlayState state) : mElapsedSeconds(0), mInHandOff(false) - { mBuffers = new AccumulatorBufferGroup(); setPlayState(state); diff --git a/indra/llcommon/llunit.h b/indra/llcommon/llunit.h index 731cc0eded..51f14a5948 100644 --- a/indra/llcommon/llunit.h +++ b/indra/llcommon/llunit.h @@ -139,6 +139,13 @@ protected: }; template<typename STORAGE_TYPE, typename UNIT_TYPE> +std::ostream& operator <<(std::ostream& s, const LLUnit<STORAGE_TYPE, UNIT_TYPE>& unit) +{ + s << unit.value() << UNIT_TYPE::getUnitLabel(); + return s; +} + +template<typename STORAGE_TYPE, typename UNIT_TYPE> struct LLUnitImplicit : public LLUnit<STORAGE_TYPE, UNIT_TYPE> { typedef LLUnitImplicit<STORAGE_TYPE, UNIT_TYPE> self_t; @@ -162,6 +169,12 @@ struct LLUnitImplicit : public LLUnit<STORAGE_TYPE, UNIT_TYPE> } }; +template<typename STORAGE_TYPE, typename UNIT_TYPE> +std::ostream& operator <<(std::ostream& s, const LLUnitImplicit<STORAGE_TYPE, UNIT_TYPE>& unit) +{ + s << unit.value() << UNIT_TYPE::getUnitLabel(); + return s; +} template<typename S, typename T> struct LLIsSameType |