diff options
author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-06 14:47:43 +0100 |
---|---|---|
committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-06 14:47:43 +0100 |
commit | 3c47d1faf1abb38ad05036de65bea3b7e21f683f (patch) | |
tree | 2a33d4ee90d0287436c63a5f8fa90cf8fd1d6ef6 /indra/newview/llworld.cpp | |
parent | 20c660569df71f677065b5f5f66477ebbd6b35b6 (diff) | |
parent | a63c59be9e7df57143ddd04e44263c232f420a21 (diff) |
another hairy merge from viewer-trunk :(
Diffstat (limited to 'indra/newview/llworld.cpp')
-rw-r--r-- | indra/newview/llworld.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llworld.cpp b/indra/newview/llworld.cpp index 58b9f5ce18..71809e3972 100644 --- a/indra/newview/llworld.cpp +++ b/indra/newview/llworld.cpp @@ -1029,9 +1029,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; |