From 516c3dfbbbbc361c8cf52e9db15c2cd099d7913a Mon Sep 17 00:00:00 2001 From: Melanie Date: Thu, 1 Dec 2011 16:12:09 +0100 Subject: [PATCH] Remove some debug code that had snuck in --- OpenSim/Region/Framework/Scenes/Scene.cs | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index df54ae295e..171443e540 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs @@ -1173,14 +1173,14 @@ namespace OpenSim.Region.Framework.Scenes m_log.ErrorFormat("[SCENE]: Restarting heartbeat thread because it hasn't reported in in region {0}", RegionInfo.RegionName); int pid = System.Diagnostics.Process.GetCurrentProcess().Id; -System.Diagnostics.Process proc = new System.Diagnostics.Process(); -proc.EnableRaisingEvents=false; -proc.StartInfo.FileName = "/bin/kill"; -proc.StartInfo.Arguments = "-QUIT " + pid.ToString(); -proc.Start(); -proc.WaitForExit(); -Thread.Sleep(1000); -Environment.Exit(1); +//System.Diagnostics.Process proc = new System.Diagnostics.Process(); +//proc.EnableRaisingEvents=false; +//proc.StartInfo.FileName = "/bin/kill"; +//proc.StartInfo.Arguments = "-QUIT " + pid.ToString(); +//proc.Start(); +//proc.WaitForExit(); +//Thread.Sleep(1000); +//Environment.Exit(1); HeartbeatThread.Abort(); Watchdog.AbortThread(HeartbeatThread.ManagedThreadId); HeartbeatThread = null;