diff options
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 171f066..f7c12d6 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -1428,7 +1428,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1428 | } | 1428 | } |
1429 | 1429 | ||
1430 | m_heartbeatThread | 1430 | m_heartbeatThread |
1431 | = Watchdog.StartThread( | 1431 | = WorkManager.StartThread( |
1432 | Heartbeat, string.Format("Heartbeat-({0})", RegionInfo.RegionName.Replace(" ", "_")), ThreadPriority.Normal, false, false); | 1432 | Heartbeat, string.Format("Heartbeat-({0})", RegionInfo.RegionName.Replace(" ", "_")), ThreadPriority.Normal, false, false); |
1433 | 1433 | ||
1434 | StartScripts(); | 1434 | StartScripts(); |
@@ -1469,7 +1469,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1469 | // alarms for scenes with many objects. | 1469 | // alarms for scenes with many objects. |
1470 | Update(1); | 1470 | Update(1); |
1471 | 1471 | ||
1472 | Watchdog.StartThread( | 1472 | WorkManager.StartThread( |
1473 | Maintenance, string.Format("Maintenance ({0})", RegionInfo.RegionName), ThreadPriority.Normal, false, true); | 1473 | Maintenance, string.Format("Maintenance ({0})", RegionInfo.RegionName), ThreadPriority.Normal, false, true); |
1474 | 1474 | ||
1475 | Watchdog.GetCurrentThreadInfo().AlarmIfTimeout = true; | 1475 | Watchdog.GetCurrentThreadInfo().AlarmIfTimeout = true; |
@@ -1568,10 +1568,10 @@ namespace OpenSim.Region.Framework.Scenes | |||
1568 | tmpMS = Util.EnvironmentTickCount(); | 1568 | tmpMS = Util.EnvironmentTickCount(); |
1569 | m_cleaningTemps = true; | 1569 | m_cleaningTemps = true; |
1570 | 1570 | ||
1571 | Watchdog.RunInThread( | 1571 | WorkManager.RunInThread( |
1572 | delegate { CleanTempObjects(); m_cleaningTemps = false; }, | 1572 | delegate { CleanTempObjects(); m_cleaningTemps = false; }, |
1573 | string.Format("CleanTempObjects ({0})", Name), | 1573 | null, |
1574 | null); | 1574 | string.Format("CleanTempObjects ({0})", Name)); |
1575 | 1575 | ||
1576 | tempOnRezMS = Util.EnvironmentTickCountSubtract(tmpMS); | 1576 | tempOnRezMS = Util.EnvironmentTickCountSubtract(tmpMS); |
1577 | } | 1577 | } |
@@ -1843,7 +1843,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1843 | if (!m_backingup) | 1843 | if (!m_backingup) |
1844 | { | 1844 | { |
1845 | m_backingup = true; | 1845 | m_backingup = true; |
1846 | Watchdog.RunInThread(o => Backup(false), string.Format("BackupWaitCallback ({0})", Name), null); | 1846 | WorkManager.RunInThread(o => Backup(false), null, string.Format("BackupWaitCallback ({0})", Name)); |
1847 | } | 1847 | } |
1848 | } | 1848 | } |
1849 | 1849 | ||