diff options
| author | Nyx Linden <nyx@lindenlab.com> | 2013-01-25 17:58:11 -0500 |
|---|---|---|
| committer | Nyx Linden <nyx@lindenlab.com> | 2013-01-25 17:58:11 -0500 |
| commit | 438ceeb008b7c4eec0fc48894935289ca352fc65 (patch) | |
| tree | c14813597483c0caeafed02e8820458fa9562a03 /indra/llcommon/llfasttimer.h | |
| parent | 11fe124ae96721b0d0f960732e8628fe0e2f84c4 (diff) | |
BUILDFIX: merge cleanup
A couple of merge issues that caused the resulting code to not build.
Diffstat (limited to 'indra/llcommon/llfasttimer.h')
| -rw-r--r-- | indra/llcommon/llfasttimer.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/llcommon/llfasttimer.h b/indra/llcommon/llfasttimer.h index e42e549df5..81c4b78775 100644 --- a/indra/llcommon/llfasttimer.h +++ b/indra/llcommon/llfasttimer.h @@ -91,6 +91,8 @@ public: U32 getHistoricalCount(S32 history_index = 0) const; U32 getHistoricalCalls(S32 history_index = 0) const; + static NamedTimer& getRootNamedTimer(); + void setFrameState(FrameState* state) { mFrameState = state; state->setNamedTimer(this); } FrameState& getFrameState() const; |