diff options
| author | Monty Brandenberg <monty@lindenlab.com> | 2013-07-18 18:43:58 -0400 |
|---|---|---|
| committer | Monty Brandenberg <monty@lindenlab.com> | 2013-07-18 18:43:58 -0400 |
| commit | 38b3da4a20a0a06396d240a5e8fdc4fa11866937 (patch) | |
| tree | 90613c999899253eb28caf04641b5ee41d827958 /indra/llcommon/llfasttimer.cpp | |
| parent | d027db3cfc7c757cc8846e1a5187d1a816f63d9a (diff) | |
| parent | 6060e5e46acbeb20a301070a0fd0efea029d33d0 (diff) | |
Merge. Refresh from viewer-release.
Diffstat (limited to 'indra/llcommon/llfasttimer.cpp')
| -rwxr-xr-x | indra/llcommon/llfasttimer.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llcommon/llfasttimer.cpp b/indra/llcommon/llfasttimer.cpp index 9b15804e97..024fdd1b4d 100755 --- a/indra/llcommon/llfasttimer.cpp +++ b/indra/llcommon/llfasttimer.cpp @@ -561,7 +561,7 @@ std::vector<LLFastTimer::NamedTimer*>& LLFastTimer::NamedTimer::getChildren() return mChildren; } -// static +//static LLFastTimer::NamedTimer& LLFastTimer::NamedTimer::getRootNamedTimer() { return *NamedTimerFactory::instance().getRootTimer(); |