diff options
| author | Geenz <geenz@geenzo.com> | 2013-06-19 15:47:57 -0400 |
|---|---|---|
| committer | Geenz <geenz@geenzo.com> | 2013-06-19 15:47:57 -0400 |
| commit | 9c83d4b5b88a927c4365154663b1809a450ccb98 (patch) | |
| tree | d59d9d5c0e42058e09d73f4ca1c04f47ee55db6c /indra/llcommon/llfasttimer.cpp | |
| parent | 72159fd03ea02422e3c6acfbed9221a5326a9cc0 (diff) | |
| parent | 2655c7a17ae38a073dcf8f05b0127b68edc34c95 (diff) | |
Merge with 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(); |