summaryrefslogtreecommitdiff
path: root/indra/newview/llworld.cpp
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-05-05 12:17:58 +0100
committerTofu Linden <tofu.linden@lindenlab.com>2010-05-05 12:17:58 +0100
commite2b51b8884d1003a3312276611b8a8c34123bc36 (patch)
tree2a62d60e216e172685670230e544103444e28c4c /indra/newview/llworld.cpp
parente2e329b2e22dbab52d12ff309fb78533cb52c8e9 (diff)
parent7bb6532e93b7536a9a11cf19db10ba0cda1d99c3 (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 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;