summaryrefslogtreecommitdiff
path: root/indra/llcommon/lltracethreadrecorder.cpp
diff options
context:
space:
mode:
authorRichard Linden <none@none>2013-12-03 15:52:36 -0800
committerRichard Linden <none@none>2013-12-03 15:52:36 -0800
commit3cb64c5038b7cde8bd44ec3a029d477e415085ee (patch)
tree38085823779454f6cd487e8dc5e4dd16dd8dd670 /indra/llcommon/lltracethreadrecorder.cpp
parent29476d29c4c78a6417c45090bdc6ea14c8251d73 (diff)
SH-4606 FIX Interesting: Small objects do not load until they are very close.
changed culling to use inverse distance to calculate solid angle, not distance squared
Diffstat (limited to 'indra/llcommon/lltracethreadrecorder.cpp')
-rw-r--r--indra/llcommon/lltracethreadrecorder.cpp21
1 files changed, 2 insertions, 19 deletions
diff --git a/indra/llcommon/lltracethreadrecorder.cpp b/indra/llcommon/lltracethreadrecorder.cpp
index aec36ef2c4..d62fabe3df 100644
--- a/indra/llcommon/lltracethreadrecorder.cpp
+++ b/indra/llcommon/lltracethreadrecorder.cpp
@@ -130,7 +130,6 @@ TimeBlockTreeNode* ThreadRecorder::getTimeBlockTreeNode( S32 index )
return NULL;
}
-
AccumulatorBufferGroup* ThreadRecorder::activate( AccumulatorBufferGroup* recording)
{
ActiveRecording* active_recording = new ActiveRecording(recording);
@@ -215,8 +214,7 @@ void ThreadRecorder::deactivate( AccumulatorBufferGroup* recording )
ThreadRecorder::ActiveRecording::ActiveRecording( AccumulatorBufferGroup* target )
: mTargetRecording(target)
-{
-}
+{}
void ThreadRecorder::ActiveRecording::movePartialToTarget()
{
@@ -238,21 +236,7 @@ void ThreadRecorder::addChildRecorder( class ThreadRecorder* child )
void ThreadRecorder::removeChildRecorder( class ThreadRecorder* child )
{
{ LLMutexLock lock(&mChildListMutex);
- for (child_thread_recorder_list_t::iterator it = mChildThreadRecorders.begin(), end_it = mChildThreadRecorders.end();
- it != end_it;
- ++it)
- {
- if ((*it) == child)
- {
- // FIXME: this won't do any good, as the child stores the "pushed" values internally
- // and it is in the process of being deleted.
- // We need a way to finalize the stats from the outgoing thread, but the storage
- // for those stats needs to be outside the child's thread recorder
- //(*it)->pushToParent();
- mChildThreadRecorders.erase(it);
- break;
- }
- }
+ mChildThreadRecorders.remove(child);
}
}
@@ -316,5 +300,4 @@ void set_thread_recorder( ThreadRecorder* recorder )
get_thread_recorder_ptr() = recorder;
}
-
}