added some defensive asserts in lltrace to make cases of misuse more obvious when it crashes

1 files changed, 15 insertions, 15 deletions

diff --git a/indra/llcommon/lltracethreadrecorder.cpp b/indra/llcommon/lltracethreadrecorder.cpp
index a14a8ff035..187d8546d3 100644
--- a/indra/llcommon/lltracethreadrecorder.cpp
+++ b/indra/llcommon/lltracethreadrecorder.cpp
@@ -191,25 +191,25 @@ ThreadRecorder::active_recording_list_t::iterator ThreadRecorder::bringUpToDate(
 void ThreadRecorder::deactivate( AccumulatorBufferGroup* recording )
 {
 	active_recording_list_t::iterator recording_it = bringUpToDate(recording);
-	if (recording_it != mActiveRecordings.end())
+	// this method should only be called on a thread where the recorder is active
+	llassert_always(recording_it != mActiveRecordings.end());
+
+	ActiveRecording* recording_to_remove = *recording_it;
+	bool was_current = recording_to_remove->mPartialRecording.isCurrent();
+	llassert(recording_to_remove->mTargetRecording == recording);
+	mActiveRecordings.erase(recording_it);
+	if (was_current)
 	{
-		ActiveRecording* recording_to_remove = *recording_it;
-		bool was_current = recording_to_remove->mPartialRecording.isCurrent();
-		llassert(recording_to_remove->mTargetRecording == recording);
-		mActiveRecordings.erase(recording_it);
-		if (was_current)
+		if (mActiveRecordings.empty())
 		{
-			if (mActiveRecordings.empty())
-			{
-				AccumulatorBufferGroup::clearCurrent();
-			}
-			else
-			{
-				mActiveRecordings.back()->mPartialRecording.makeCurrent();
-			}
+			AccumulatorBufferGroup::clearCurrent();
+		}
+		else
+		{
+			mActiveRecordings.back()->mPartialRecording.makeCurrent();
 		}
-		delete recording_to_remove;
 	}
+	delete recording_to_remove;
 }
 
 ThreadRecorder::ActiveRecording::ActiveRecording( AccumulatorBufferGroup* target )