diff options
| author | Richard Linden <none@none> | 2013-01-17 20:04:39 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-01-17 20:04:39 -0800 |
| commit | 0825eb0207a51e0f747fc04e7c9b6bd6a76e86fe (patch) | |
| tree | c87749c8e9c98c695aa6daae9a6660582580ae4e /indra/llcommon/lltrace.h | |
| parent | a0413bdef71d804bbf008cf319f54a5a47efb29c (diff) | |
| parent | 670d03ceb83b92c9bb98d10bb37fba6f75971a2f (diff) | |
merge
Diffstat (limited to 'indra/llcommon/lltrace.h')
| -rw-r--r-- | indra/llcommon/lltrace.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/llcommon/lltrace.h b/indra/llcommon/lltrace.h index ab4ad59e3d..1d3c376a58 100644 --- a/indra/llcommon/lltrace.h +++ b/indra/llcommon/lltrace.h @@ -446,11 +446,12 @@ namespace LLTrace // // members // - U64 mSelfTimeCounter, + U64 mChildTimeCounter, mTotalTimeCounter; U32 mCalls; + class TimeBlock* mBlock; // block associated with this accumulator class TimeBlock* mParent; // last acknowledged parent of this time block - class TimeBlock* mLastCaller; // used to bootstrap tree construction + TimeBlockAccumulator* mLastAccumulator; // used to bootstrap tree construction U16 mActiveCount; // number of timers with this ID active on stack bool mMoveUpTree; // needs to be moved up the tree of timers at the end of frame |