summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerpartsim.cpp
diff options
context:
space:
mode:
authorRichard Linden <none@none>2013-09-05 14:04:13 -0700
committerRichard Linden <none@none>2013-09-05 14:04:13 -0700
commitcbe397ad13665c7bc993e10d8fe1e4a876253378 (patch)
tree52cd665a1138a65bd8ebfc94478c665ea40b2e25 /indra/newview/llviewerpartsim.cpp
parent12688c8b549d2baa33509dca60bbe14b039b17db (diff)
changed fast timer over to using macro
another attempt to move mem stat into base class
Diffstat (limited to 'indra/newview/llviewerpartsim.cpp')
-rwxr-xr-xindra/newview/llviewerpartsim.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llviewerpartsim.cpp b/indra/newview/llviewerpartsim.cpp
index 09b6b8eb4b..eb89a887ac 100755
--- a/indra/newview/llviewerpartsim.cpp
+++ b/indra/newview/llviewerpartsim.cpp
@@ -631,7 +631,7 @@ void LLViewerPartSim::shift(const LLVector3 &offset)
}
}
-static LLFastTimer::DeclareTimer FTM_SIMULATE_PARTICLES("Simulate Particles");
+static LLTrace::TimeBlock FTM_SIMULATE_PARTICLES("Simulate Particles");
void LLViewerPartSim::updateSimulation()
{
@@ -644,7 +644,7 @@ void LLViewerPartSim::updateSimulation()
return;
}
- LLFastTimer ftm(FTM_SIMULATE_PARTICLES);
+ LL_RECORD_BLOCK_TIME(FTM_SIMULATE_PARTICLES);
// Start at a random particle system so the same
// particle system doesn't always get first pick at the