diff options
| author | prep <prep@lindenlab.com> | 2013-03-11 15:17:13 -0400 |
|---|---|---|
| committer | prep <prep@lindenlab.com> | 2013-03-11 15:17:13 -0400 |
| commit | 8e3b190e919fde84a2189d974208f9d199d4bea6 (patch) | |
| tree | 7ab1db96d291260cbad356533607e1bce36ed0a7 /indra/llcommon/llfasttimer.cpp | |
| parent | 2ea750ebcad8335aeb0ec77a483831b62d05f643 (diff) | |
| parent | e0c9174609e2457fab7fe6d7291c6ebbd030397c (diff) | |
merge
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 6970c29092..9b15804e97 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 void LLFastTimer::nextFrame() { |