Merge branch 'master' into careminster

Conflicts:
	OpenSim/Region/Application/OpenSimBase.cs
	OpenSim/Region/Framework/Scenes/Scene.cs

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
                 scene.SnmpService.LinkUp(scene);
             }
 
-            scene.StartTimer();
-            scene.StartTimerWatchdog();
+            scene.Start();
 
             scene.StartScripts();