summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
Diffstat (limited to 'indra')
-rw-r--r--indra/llcommon/lltracerecording.cpp12
-rw-r--r--indra/newview/llviewerobjectlist.cpp10
2 files changed, 11 insertions, 11 deletions
diff --git a/indra/llcommon/lltracerecording.cpp b/indra/llcommon/lltracerecording.cpp
index b70d42b082..f78b7942a7 100644
--- a/indra/llcommon/lltracerecording.cpp
+++ b/indra/llcommon/lltracerecording.cpp
@@ -116,12 +116,12 @@ void RecordingBuffers::mergeBuffers( const RecordingBuffers& other)
void RecordingBuffers::resetBuffers(RecordingBuffers* other)
{
- mCountsFloat.write()->reset(other ? other->mCountsFloat : NULL);
- mMeasurementsFloat.write()->reset(other ? other->mMeasurementsFloat : NULL);
- mCounts.write()->reset(other ? other->mCounts : NULL);
- mMeasurements.write()->reset(other ? other->mMeasurements : NULL);
- mStackTimers.write()->reset(other ? other->mStackTimers : NULL);
- mMemStats.write()->reset(other ? other->mMemStats : NULL);
+ mCountsFloat.write()->reset(other ? other->mCountsFloat : LLCopyOnWritePointer<AccumulatorBuffer<CountAccumulator<F64> > >());
+ mMeasurementsFloat.write()->reset(other ? other->mMeasurementsFloat : LLCopyOnWritePointer<AccumulatorBuffer<MeasurementAccumulator<F64> > >());
+ mCounts.write()->reset(other ? other->mCounts : LLCopyOnWritePointer<AccumulatorBuffer<CountAccumulator<S64> > >());
+ mMeasurements.write()->reset(other ? other->mMeasurements : LLCopyOnWritePointer<AccumulatorBuffer<MeasurementAccumulator<S64> > >());
+ mStackTimers.write()->reset(other ? other->mStackTimers : LLCopyOnWritePointer<AccumulatorBuffer<TimeBlockAccumulator> >());
+ mMemStats.write()->reset(other ? other->mMemStats : LLCopyOnWritePointer<AccumulatorBuffer<MemStatAccumulator> >());
}
///////////////////////////////////////////////////////////////////////
diff --git a/indra/newview/llviewerobjectlist.cpp b/indra/newview/llviewerobjectlist.cpp
index 5ccb19ab2e..922d386818 100644
--- a/indra/newview/llviewerobjectlist.cpp
+++ b/indra/newview/llviewerobjectlist.cpp
@@ -262,7 +262,7 @@ void LLViewerObjectList::processUpdateCore(LLViewerObject* objectp,
// so that the drawable parent is set properly
if(msg != NULL)
{
- findOrphans(objectp, msg->getSenderIP(), msg->getSenderPort());
+ findOrphans(objectp, msg->getSenderIP(), msg->getSenderPort());
}
else
{
@@ -451,9 +451,9 @@ void LLViewerObjectList::processObjectUpdate(LLMessageSystem *mesgsys,
if (compressed)
{
- S32 uncompressed_length = 2048;
- compressed_dp.reset();
-
+ S32 uncompressed_length = 2048;
+ compressed_dp.reset();
+
uncompressed_length = mesgsys->getSizeFast(_PREHASH_ObjectData, i, _PREHASH_Data);
mesgsys->getBinaryDataFast(_PREHASH_ObjectData, _PREHASH_Data, compressed_dpbuffer, 0, i);
compressed_dp.assignBuffer(compressed_dpbuffer, uncompressed_length);
@@ -626,10 +626,10 @@ void LLViewerObjectList::processObjectUpdate(LLMessageSystem *mesgsys,
bCached = true;
LLViewerRegion::eCacheUpdateResult result = objectp->mRegionp->cacheFullUpdate(objectp, compressed_dp, flags);
recorder.cacheFullUpdate(local_id, update_type, result, objectp, msg_size);
+ }
}
#endif
}
- }
else
{
if (update_type == OUT_FULL)