summaryrefslogtreecommitdiff
path: root/indra/newview/llworld.cpp
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-05-07 08:40:59 +0100
committerTofu Linden <tofu.linden@lindenlab.com>2010-05-07 08:40:59 +0100
commit3b2073270b2702a682b655c470ecae310822c29e (patch)
treef0c5484493ffc1319439f31b1df77bf9d818bdbb /indra/newview/llworld.cpp
parentb89c31052802450ec59fee48ace4c66a713755ab (diff)
parent9b9eedb8a3db6d4b1e5eab8dbff8f68415cfd4b3 (diff)
merge from viewer-trunk
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;