diff options
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Application/OpenSimBase.cs
OpenSim/Region/Framework/Scenes/Scene.cs
Diffstat (limited to 'OpenSim/Region/Application/OpenSimBase.cs')
-rw-r--r-- | OpenSim/Region/Application/OpenSimBase.cs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs index b304403..c1d0727 100644 --- a/OpenSim/Region/Application/OpenSimBase.cs +++ b/OpenSim/Region/Application/OpenSimBase.cs | |||
@@ -508,8 +508,7 @@ namespace OpenSim | |||
508 | scene.SnmpService.LinkUp(scene); | 508 | scene.SnmpService.LinkUp(scene); |
509 | } | 509 | } |
510 | 510 | ||
511 | scene.StartTimer(); | 511 | scene.Start(); |
512 | scene.StartTimerWatchdog(); | ||
513 | 512 | ||
514 | scene.StartScripts(); | 513 | scene.StartScripts(); |
515 | 514 | ||