diff options
| author | Richard Linden <none@none> | 2013-07-15 11:06:22 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-07-15 11:06:22 -0700 |
| commit | c03e366a6022d13fcf7b7e502daff8c72f7b64ee (patch) | |
| tree | 6f92e21824332b5357f8befe4c978b83dbaa1aef /indra/llcommon/lltracethreadrecorder.h | |
| parent | 27de692bd7b297c9cd0fd6abcdee4b3e2486ec52 (diff) | |
| parent | 11e14cd3b0f58225a96b9b7a9839a7f030fe4045 (diff) | |
Automated merge with https://bitbucket.org/lindenlab/viewer-interesting
Diffstat (limited to 'indra/llcommon/lltracethreadrecorder.h')
| -rw-r--r-- | indra/llcommon/lltracethreadrecorder.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llcommon/lltracethreadrecorder.h b/indra/llcommon/lltracethreadrecorder.h index 535f855200..c40228785e 100644 --- a/indra/llcommon/lltracethreadrecorder.h +++ b/indra/llcommon/lltracethreadrecorder.h @@ -47,7 +47,7 @@ namespace LLTrace ~ThreadRecorder(); - void activate(AccumulatorBufferGroup* recording); + void activate(AccumulatorBufferGroup* recording, bool from_handoff = false); void deactivate(AccumulatorBufferGroup* recording); active_recording_list_t::reverse_iterator bringUpToDate(AccumulatorBufferGroup* recording); |