aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Monitoring/WorkManager.cs
diff options
context:
space:
mode:
authorMelanie Thielker2016-05-23 19:20:05 +0200
committerMelanie Thielker2016-05-23 19:20:05 +0200
commit08bd80f5f4597b7841c02063fa53723cabcc3c4d (patch)
treee3651d867887ea4b979a4e0c61a94018359fc94a /OpenSim/Framework/Monitoring/WorkManager.cs
parentFixed discrepancy between code and ini symbols. (diff)
parentMinor improvement over the previous commit -- make sure the code exists in th... (diff)
downloadopensim-SC-08bd80f5f4597b7841c02063fa53723cabcc3c4d.zip
opensim-SC-08bd80f5f4597b7841c02063fa53723cabcc3c4d.tar.gz
opensim-SC-08bd80f5f4597b7841c02063fa53723cabcc3c4d.tar.bz2
opensim-SC-08bd80f5f4597b7841c02063fa53723cabcc3c4d.tar.xz
Merge branch 'master' of opensimulator.org:/var/git/opensim
Diffstat (limited to 'OpenSim/Framework/Monitoring/WorkManager.cs')
-rw-r--r--OpenSim/Framework/Monitoring/WorkManager.cs5
1 files changed, 3 insertions, 2 deletions
diff --git a/OpenSim/Framework/Monitoring/WorkManager.cs b/OpenSim/Framework/Monitoring/WorkManager.cs
index d1a74ce..a7a03a0 100644
--- a/OpenSim/Framework/Monitoring/WorkManager.cs
+++ b/OpenSim/Framework/Monitoring/WorkManager.cs
@@ -121,7 +121,8 @@ namespace OpenSim.Framework.Monitoring
121 Thread thread = new Thread(start); 121 Thread thread = new Thread(start);
122 thread.Priority = priority; 122 thread.Priority = priority;
123 thread.IsBackground = isBackground; 123 thread.IsBackground = isBackground;
124 124 thread.Name = name;
125
125 Watchdog.ThreadWatchdogInfo twi 126 Watchdog.ThreadWatchdogInfo twi
126 = new Watchdog.ThreadWatchdogInfo(thread, timeout, name) 127 = new Watchdog.ThreadWatchdogInfo(thread, timeout, name)
127 { AlarmIfTimeout = alarmIfTimeout, AlarmMethod = alarmMethod }; 128 { AlarmIfTimeout = alarmIfTimeout, AlarmMethod = alarmMethod };
@@ -129,7 +130,7 @@ namespace OpenSim.Framework.Monitoring
129 Watchdog.AddThread(twi, name, log:log); 130 Watchdog.AddThread(twi, name, log:log);
130 131
131 thread.Start(); 132 thread.Start();
132 thread.Name = name; 133
133 134
134 return thread; 135 return thread;
135 } 136 }