summaryrefslogtreecommitdiff
path: root/indra/newview/llworld.cpp
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2010-04-07 12:39:45 -0500
committerDave Parks <davep@lindenlab.com>2010-04-07 12:39:45 -0500
commitb6d3d2281b855448bbeec33b2d229222d75cd6b1 (patch)
tree99b5c533bcf19a4b02247e601939346b6f2151df /indra/newview/llworld.cpp
parent87cce27de3dd23a40d812a7c9000b1972cb4bca3 (diff)
parent3b7b578733867efaeb9359df69df1fe400de0f10 (diff)
merge
Diffstat (limited to 'indra/newview/llworld.cpp')
-rw-r--r--indra/newview/llworld.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llworld.cpp b/indra/newview/llworld.cpp
index 0b63f5efbd..c7148f8826 100644
--- a/indra/newview/llworld.cpp
+++ b/indra/newview/llworld.cpp
@@ -1028,9 +1028,11 @@ void LLWorld::disconnectRegions()
}
}
+static LLFastTimer::DeclareTimer FTM_ENABLE_SIMULATOR("Enable Sim");
void process_enable_simulator(LLMessageSystem *msg, void **user_data)
{
+ LLFastTimer t(FTM_ENABLE_SIMULATOR);
// enable the appropriate circuit for this simulator and
// add its values into the gSimulator structure
U64 handle;