diff options
| author | Melanie | 2012-03-23 02:44:22 +0000 |
|---|---|---|
| committer | Melanie | 2012-03-23 02:44:22 +0000 |
| commit | 2190a62366a633e93e2d4b0284962127f1a5cbf9 (patch) | |
| tree | 326b866b027bd57c8edf158a5514b13c4ad20768 /OpenSim/Region/Application | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Remove unnecessary shutting down check in Scene.Heartbeat(). Add some method... (diff) | |
| download | opensim-SC-2190a62366a633e93e2d4b0284962127f1a5cbf9.zip opensim-SC-2190a62366a633e93e2d4b0284962127f1a5cbf9.tar.gz opensim-SC-2190a62366a633e93e2d4b0284962127f1a5cbf9.tar.bz2 opensim-SC-2190a62366a633e93e2d4b0284962127f1a5cbf9.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Application/OpenSimBase.cs
OpenSim/Region/Framework/Scenes/Scene.cs
Diffstat (limited to 'OpenSim/Region/Application')
| -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 | ||