diff options
author | Melanie | 2019-07-29 18:05:30 +0100 |
---|---|---|
committer | Melanie | 2019-07-29 18:05:30 +0100 |
commit | 1c8508cfbd81f74ac41975d22e38302594ef424b (patch) | |
tree | 1a31e248c35513a2eb2e084b6d4ab67c041dff66 | |
parent | Fix godnames module to not add the empty string if only one option is used (diff) | |
download | opensim-SC-1c8508cfbd81f74ac41975d22e38302594ef424b.zip opensim-SC-1c8508cfbd81f74ac41975d22e38302594ef424b.tar.gz opensim-SC-1c8508cfbd81f74ac41975d22e38302594ef424b.tar.bz2 opensim-SC-1c8508cfbd81f74ac41975d22e38302594ef424b.tar.xz |
Put back the code to create the ready marker file.
-rwxr-xr-x | OpenSim/Region/Framework/Scenes/Scene.cs | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 073d11f..377ba29 100755 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -1776,6 +1776,29 @@ namespace OpenSim.Region.Framework.Scenes | |||
1776 | 1776 | ||
1777 | // Region ready should always be set | 1777 | // Region ready should always be set |
1778 | Ready = true; | 1778 | Ready = true; |
1779 | |||
1780 | IConfig restartConfig = m_config.Configs["RestartModule"]; | ||
1781 | if (restartConfig != null) | ||
1782 | { | ||
1783 | string markerPath = restartConfig.GetString("MarkerPath", String.Empty); | ||
1784 | |||
1785 | if (markerPath != String.Empty) | ||
1786 | { | ||
1787 | string path = Path.Combine(markerPath, RegionInfo.RegionID.ToString() + ".ready"); | ||
1788 | try | ||
1789 | { | ||
1790 | string pidstring = System.Diagnostics.Process.GetCurrentProcess().Id.ToString(); | ||
1791 | FileStream fs = File.Create(path); | ||
1792 | System.Text.ASCIIEncoding enc = new System.Text.ASCIIEncoding(); | ||
1793 | Byte[] buf = enc.GetBytes(pidstring); | ||
1794 | fs.Write(buf, 0, buf.Length); | ||
1795 | fs.Close(); | ||
1796 | } | ||
1797 | catch (Exception) | ||
1798 | { | ||
1799 | } | ||
1800 | } | ||
1801 | } | ||
1779 | } | 1802 | } |
1780 | else | 1803 | else |
1781 | { | 1804 | { |