2 files changed, 34 insertions, 15 deletions

diff --git a/indra/llcommon/llqueuedthread.cpp b/indra/llcommon/llqueuedthread.cpp
index 956642e97a..4339f203db 100644
--- a/indra/llcommon/llqueuedthread.cpp
+++ b/indra/llcommon/llqueuedthread.cpp
@@ -404,6 +404,7 @@ S32 LLQueuedThread::processNextRequest()
 	QueuedRequest *req;
 	// Get next request from pool
 	lockData();
+	
 	while(1)
 	{
 		req = NULL;
@@ -468,10 +469,11 @@ S32 LLQueuedThread::processNextRequest()
 				ms_sleep(1); // sleep the thread a little
 			}
 		}
+		
+		LLTrace::get_thread_recorder()->pushToMaster();
 	}
 
 	S32 pending = getPending();
-
 	return pending;
 }
 
@@ -500,6 +502,7 @@ void LLQueuedThread::run()
 		
 		if (isQuitting())
 		{
+			LLTrace::get_thread_recorder()->pushToMaster();
 			endThread();
 			break;
 		}
@@ -508,11 +511,9 @@ void LLQueuedThread::run()
 
 		threadedUpdate();
 		
-		int res = processNextRequest();
-
-		LLTrace::get_thread_recorder()->pushToMaster();
+		int pending_work = processNextRequest();
 
-		if (res == 0)
+		if (pending_work == 0)
 		{
 			mIdleThread = TRUE;
 			ms_sleep(1);
diff --git a/indra/llcommon/lltracerecording.cpp b/indra/llcommon/lltracerecording.cpp
index 6b5c6c7d3e..4aa3a5a0f7 100644
--- a/indra/llcommon/lltracerecording.cpp
+++ b/indra/llcommon/lltracerecording.cpp
@@ -133,11 +133,19 @@ Recording::Recording()
 {}
 
 Recording::Recording( const Recording& other )
-:	RecordingBuffers(other),
-	mElapsedSeconds(other.mElapsedSeconds),
-	mSamplingTimer(other.mSamplingTimer)
+:	mSamplingTimer(other.mSamplingTimer)
 {
-	LLStopWatchControlsMixin<Recording>::setPlayState(other.getPlayState());
+	Recording& mutable_other = const_cast<Recording&>(other);
+	EPlayState other_play_state = other.getPlayState();
+	mutable_other.pause();
+
+	appendBuffers(other);
+
+	LLStopWatchControlsMixin<Recording>::setPlayState(other_play_state);
+	mutable_other.setPlayState(other_play_state);
+
+	// above call will clear mElapsedSeconds as a side effect, so copy it here
+	mElapsedSeconds = other.mElapsedSeconds;
 }
 
 
@@ -380,9 +388,7 @@ void PeriodicRecording::nextPeriod()
 
 	Recording& old_recording = getCurRecording();
 
-	mCurPeriod = mRecordingPeriods.empty()
-				? mCurPeriod + 1
-				: (mCurPeriod + 1) % mRecordingPeriods.size();
+	mCurPeriod = (mCurPeriod + 1) % mRecordingPeriods.size();
 	old_recording.splitTo(getCurRecording());
 }
 
@@ -526,9 +532,22 @@ void PeriodicRecording::handleStop()
 
 void PeriodicRecording::handleReset()
 {
-	mRecordingPeriods.clear();
-	mRecordingPeriods.push_back(Recording());
+	if (mAutoResize)
+	{
+		mRecordingPeriods.clear();
+		mRecordingPeriods.push_back(Recording());
+	}
+	else
+	{
+		for (std::vector<Recording>::iterator it = mRecordingPeriods.begin(), end_it = mRecordingPeriods.end();
+			it != end_it;
+			++it)
+		{
+			it->reset();
+		}
+	}
 	mCurPeriod = 0;
+	getCurRecording().setPlayState(getPlayState());
 }
 
 void PeriodicRecording::handleSplitTo(PeriodicRecording& other)
@@ -656,7 +675,6 @@ void LLStopWatchControlsMixinCommon::stop()
 	case STOPPED:
 		break;
 	case PAUSED:
-		handleStop();
 		break;
 	case STARTED:
 		handleStop();