diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-05-08 14:46:00 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-05-08 14:46:00 -0400 |
| commit | 1b984d8f40d805341b8c1fc670c29b32c25ce227 (patch) | |
| tree | fb73a6224dfe7ff7d5bf4619a799b0ededffcb64 /indra/llcommon/llfasttimer.cpp | |
| parent | 21ba1e9c1e8afeb1b3cf67462f6e16ff8f6ae91a (diff) | |
| parent | 1beb15c93b139e4494bb90cce30b1c67accb4b08 (diff) | |
merge changes for 3.5.1-release
Diffstat (limited to 'indra/llcommon/llfasttimer.cpp')
| -rw-r--r-- | indra/llcommon/llfasttimer.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/llcommon/llfasttimer.cpp b/indra/llcommon/llfasttimer.cpp index 024fdd1b4d..ec94691cae 100644 --- a/indra/llcommon/llfasttimer.cpp +++ b/indra/llcommon/llfasttimer.cpp @@ -561,6 +561,12 @@ std::vector<LLFastTimer::NamedTimer*>& LLFastTimer::NamedTimer::getChildren() return mChildren; } +// static +LLFastTimer::NamedTimer& LLFastTimer::NamedTimer::getRootNamedTimer() +{ + return *NamedTimerFactory::instance().getRootTimer(); +} + //static LLFastTimer::NamedTimer& LLFastTimer::NamedTimer::getRootNamedTimer() { |