ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-10 03:06:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into careminster

Browse Source 
Conflicts:
	OpenSim/Region/Application/OpenSimBase.cs
	OpenSim/Region/Framework/Scenes/Scene.cs
This commit is contained in:
Melanie
2012-03-23 02:44:22 +00:00
parent dfd7068864 349454ca27
commit 2190a62366
6 changed files with 96 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
OpenSim/Region/Application/OpenSimBase.cs
View File

@@ -508,8 +508,7 @@ namespace OpenSim
scene.SnmpService.LinkUp(scene);
}
scene.StartTimer();
scene.StartTimerWatchdog();
scene.Start();
scene.StartScripts();