summaryrefslogtreecommitdiff
path: root/indra/llcommon
diff options
context:
space:
mode:
authorRichard Linden <none@none>2012-11-30 15:48:22 -0800
committerRichard Linden <none@none>2012-11-30 15:48:22 -0800
commitca37317a1473bb79ef8de4f683231700cb9e062c (patch)
tree77acff27e91b28c93612d841b29eda95c00f1142 /indra/llcommon
parent02d503bf8f8890c6d4b57dd09a1fde2973715b75 (diff)
SH-3406 WIP convert fast timers to lltrace system
fixed crash when sending viewer asset stats
Diffstat (limited to 'indra/llcommon')
-rw-r--r--indra/llcommon/lltracerecording.cpp13
-rw-r--r--indra/llcommon/lltracerecording.h2
2 files changed, 11 insertions, 4 deletions
diff --git a/indra/llcommon/lltracerecording.cpp b/indra/llcommon/lltracerecording.cpp
index e7ed55e8ae..e31e36cb27 100644
--- a/indra/llcommon/lltracerecording.cpp
+++ b/indra/llcommon/lltracerecording.cpp
@@ -58,10 +58,6 @@ Recording::Recording( const Recording& other )
mStackTimers = other.mStackTimers;
LLStopWatchControlsMixin::initTo(other.getPlayState());
- if (other.isStarted())
- {
- handleStart();
- }
}
@@ -127,6 +123,15 @@ bool Recording::isPrimary() const
return mCounts->isPrimary();
}
+void Recording::makeUnique()
+{
+ mCountsFloat.makeUnique();
+ mMeasurementsFloat.makeUnique();
+ mCounts.makeUnique();
+ mMeasurements.makeUnique();
+ mStackTimers.makeUnique();
+}
+
void Recording::appendRecording( const Recording& other )
{
mCountsFloat.write()->addSamples(*other.mCountsFloat);
diff --git a/indra/llcommon/lltracerecording.h b/indra/llcommon/lltracerecording.h
index efc54d240f..e5a21a2d38 100644
--- a/indra/llcommon/lltracerecording.h
+++ b/indra/llcommon/lltracerecording.h
@@ -112,6 +112,8 @@ namespace LLTrace
void makePrimary();
bool isPrimary() const;
+ void makeUnique();
+
void appendRecording(const Recording& other);
void update();