summaryrefslogtreecommitdiff
path: root/indra/newview/llworld.cpp
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-05-27 12:34:05 +0100
committerTofu Linden <tofu.linden@lindenlab.com>2010-05-27 12:34:05 +0100
commit617e9614455fb8c70fb6c219ceeab0b53adf25b5 (patch)
tree8e79762251a307cedbac037ece893cf12b0ef9b2 /indra/newview/llworld.cpp
parente5273960de222ffae32405fde8e9fd566ff72d0a (diff)
parentd0a6165713aa94654f7948151c6fbbe0a7d315f2 (diff)
merge from viewer-public
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 f30567f481..a1e4df8a66 100644
--- a/indra/newview/llworld.cpp
+++ b/indra/newview/llworld.cpp
@@ -1055,9 +1055,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;