diff options
author | Dave Parks <none@none> | 2010-06-08 23:13:05 -0500 |
---|---|---|
committer | Dave Parks <none@none> | 2010-06-08 23:13:05 -0500 |
commit | c2da9f5d2cc86af0af34199c53e872fbff22637b (patch) | |
tree | 326f7e77cf619eb81c5838791b2e4f0a60a032d4 /indra/newview/llworld.cpp | |
parent | 2cfc9f57bb22ab732cdc55b5e48ff9a05040d05a (diff) | |
parent | 22102e41cbf4ce9e1c0d069f111849466e297520 (diff) |
Merge with viewer-experimental
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 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; |