diff options
| author | dolphin <dolphin@lindenlab.com> | 2013-06-19 09:58:43 -0700 |
|---|---|---|
| committer | dolphin <dolphin@lindenlab.com> | 2013-06-19 09:58:43 -0700 |
| commit | ea40b3a37b0f9b7e09e999a2c6529905e251ecad (patch) | |
| tree | 9cfb5603040efc7738bca633b902c190db28b0bf /indra/llcommon/llfasttimer.cpp | |
| parent | ebc604fa8d12fb08fda1ac55aae817ad0135bb6b (diff) | |
| parent | 2655c7a17ae38a073dcf8f05b0127b68edc34c95 (diff) | |
Merge with viewer 3.6.0
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(); |