diff options
| author | simon <none@none> | 2013-04-11 16:18:34 -0700 |
|---|---|---|
| committer | simon <none@none> | 2013-04-11 16:18:34 -0700 |
| commit | b42b7897233df17eb0f37af2ada9070dbb075eeb (patch) | |
| tree | 5d83e305bf3afac18dec414335fe248be3aaedef /indra/llcommon/llfasttimer.cpp | |
| parent | c262cb15d38cdf344b6e1ca755e611b02d3db79d (diff) | |
| parent | c7bab8ab8b25249d1f8f87746b50fce4820f542a (diff) | |
Merge in downstream code (chui fixes, materials)
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() { |