diff options
| author | Aura Linden <aura@lindenlab.com> | 2013-07-11 17:49:13 -0700 |
|---|---|---|
| committer | Aura Linden <aura@lindenlab.com> | 2013-07-11 17:49:13 -0700 |
| commit | ce9962b33872db65b70c9b10901ec9062cb59169 (patch) | |
| tree | 94be5367128e241ef1c6f802e8551a9b4ed786ff /indra/llcommon/llfasttimer.cpp | |
| parent | 8642f57dd95864ec6b002f6519701f30866c6502 (diff) | |
| parent | 6060e5e46acbeb20a301070a0fd0efea029d33d0 (diff) | |
Merged in viewer-release
Diffstat (limited to 'indra/llcommon/llfasttimer.cpp')
| -rwxr-xr-x[-rw-r--r--] | 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 100644..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(); |