aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes
diff options
context:
space:
mode:
authorMelanie2011-12-01 13:30:10 +0100
committerMelanie2011-12-01 13:30:10 +0100
commit797982ee11fd117e74ff3b09c7b74c1973062c8e (patch)
tree962a3d1c40f9c349bc667d7bd527704e38cd15c5 /OpenSim/Region/Framework/Scenes
parentMerge branch 'bigmerge' of ssh://3dhosting.de/var/git/careminster into bigmerge (diff)
downloadopensim-SC-797982ee11fd117e74ff3b09c7b74c1973062c8e.zip
opensim-SC-797982ee11fd117e74ff3b09c7b74c1973062c8e.tar.gz
opensim-SC-797982ee11fd117e74ff3b09c7b74c1973062c8e.tar.bz2
opensim-SC-797982ee11fd117e74ff3b09c7b74c1973062c8e.tar.xz
Implement llTransferLindenDollars
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs10
1 files changed, 10 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 2323335..df54ae2 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -1171,6 +1171,16 @@ namespace OpenSim.Region.Framework.Scenes
1171 if(m_hbRestarts > 10) 1171 if(m_hbRestarts > 10)
1172 Environment.Exit(1); 1172 Environment.Exit(1);
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;
1175
1176System.Diagnostics.Process proc = new System.Diagnostics.Process();
1177proc.EnableRaisingEvents=false;
1178proc.StartInfo.FileName = "/bin/kill";
1179proc.StartInfo.Arguments = "-QUIT " + pid.ToString();
1180proc.Start();
1181proc.WaitForExit();
1182Thread.Sleep(1000);
1183Environment.Exit(1);
1174 HeartbeatThread.Abort(); 1184 HeartbeatThread.Abort();
1175 Watchdog.AbortThread(HeartbeatThread.ManagedThreadId); 1185 Watchdog.AbortThread(HeartbeatThread.ManagedThreadId);
1176 HeartbeatThread = null; 1186 HeartbeatThread = null;