diff options
| author | Melanie | 2011-12-01 16:12:09 +0100 |
|---|---|---|
| committer | Melanie | 2011-12-01 16:12:09 +0100 |
| commit | 516c3dfbbbbc361c8cf52e9db15c2cd099d7913a (patch) | |
| tree | 526526b9f074264b54f5b353a49911c7da3e1377 /OpenSim | |
| parent | Implement llTransferLindenDollars (diff) | |
| download | opensim-SC_OLD-516c3dfbbbbc361c8cf52e9db15c2cd099d7913a.zip opensim-SC_OLD-516c3dfbbbbc361c8cf52e9db15c2cd099d7913a.tar.gz opensim-SC_OLD-516c3dfbbbbc361c8cf52e9db15c2cd099d7913a.tar.bz2 opensim-SC_OLD-516c3dfbbbbc361c8cf52e9db15c2cd099d7913a.tar.xz | |
Remove some debug code that had snuck in
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index df54ae2..171443e 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
| @@ -1173,14 +1173,14 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 1173 | m_log.ErrorFormat("[SCENE]: Restarting heartbeat thread because it hasn't reported in in region {0}", RegionInfo.RegionName); | 1173 | m_log.ErrorFormat("[SCENE]: Restarting heartbeat thread because it hasn't reported in in region {0}", RegionInfo.RegionName); |
| 1174 | int pid = System.Diagnostics.Process.GetCurrentProcess().Id; | 1174 | int pid = System.Diagnostics.Process.GetCurrentProcess().Id; |
| 1175 | 1175 | ||
| 1176 | System.Diagnostics.Process proc = new System.Diagnostics.Process(); | 1176 | //System.Diagnostics.Process proc = new System.Diagnostics.Process(); |
| 1177 | proc.EnableRaisingEvents=false; | 1177 | //proc.EnableRaisingEvents=false; |
| 1178 | proc.StartInfo.FileName = "/bin/kill"; | 1178 | //proc.StartInfo.FileName = "/bin/kill"; |
| 1179 | proc.StartInfo.Arguments = "-QUIT " + pid.ToString(); | 1179 | //proc.StartInfo.Arguments = "-QUIT " + pid.ToString(); |
| 1180 | proc.Start(); | 1180 | //proc.Start(); |
| 1181 | proc.WaitForExit(); | 1181 | //proc.WaitForExit(); |
| 1182 | Thread.Sleep(1000); | 1182 | //Thread.Sleep(1000); |
| 1183 | Environment.Exit(1); | 1183 | //Environment.Exit(1); |
| 1184 | HeartbeatThread.Abort(); | 1184 | HeartbeatThread.Abort(); |
| 1185 | Watchdog.AbortThread(HeartbeatThread.ManagedThreadId); | 1185 | Watchdog.AbortThread(HeartbeatThread.ManagedThreadId); |
| 1186 | HeartbeatThread = null; | 1186 | HeartbeatThread = null; |