summaryrefslogtreecommitdiff
path: root/indra/newview/llworld.cpp
diff options
context:
space:
mode:
authorDessie Linden <dessie@lindenlab.com>2010-06-11 11:51:14 -0700
committerDessie Linden <dessie@lindenlab.com>2010-06-11 11:51:14 -0700
commit8ea4802251cbfb4fcf112f597f4a4ff1ab0d3f1f (patch)
tree74db74b999f98cbe200d9c9e3eb1c9f58fad0062 /indra/newview/llworld.cpp
parentaf4a2ec0f9f4e51e186f4b386b4465f6e107b63b (diff)
parenta0de40ddfa0cd318cb0b67e72e1739a706ff3a85 (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 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;