diff options
| author | Melanie | 2012-07-12 08:55:16 +0100 |
|---|---|---|
| committer | Melanie | 2012-07-12 08:55:16 +0100 |
| commit | d632fd7124e3962534fc34f9c7749615dbb62108 (patch) | |
| tree | 84ece06822680bfd5b639d9c3fd046ecbb7a154e /OpenSim/Framework/Servers | |
| parent | Merge branch 'avination' into careminster (diff) | |
| parent | Many explanitory comments added to the link and delink code in (diff) | |
| download | opensim-SC_OLD-d632fd7124e3962534fc34f9c7749615dbb62108.zip opensim-SC_OLD-d632fd7124e3962534fc34f9c7749615dbb62108.tar.gz opensim-SC_OLD-d632fd7124e3962534fc34f9c7749615dbb62108.tar.bz2 opensim-SC_OLD-d632fd7124e3962534fc34f9c7749615dbb62108.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
Diffstat (limited to 'OpenSim/Framework/Servers')
| -rw-r--r-- | OpenSim/Framework/Servers/BaseOpenSimServer.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Framework/Servers/BaseOpenSimServer.cs b/OpenSim/Framework/Servers/BaseOpenSimServer.cs index 7bbb290..9a2cd0e 100644 --- a/OpenSim/Framework/Servers/BaseOpenSimServer.cs +++ b/OpenSim/Framework/Servers/BaseOpenSimServer.cs | |||
| @@ -591,8 +591,8 @@ namespace OpenSim.Framework.Servers | |||
| 591 | { | 591 | { |
| 592 | string pidstring = System.Diagnostics.Process.GetCurrentProcess().Id.ToString(); | 592 | string pidstring = System.Diagnostics.Process.GetCurrentProcess().Id.ToString(); |
| 593 | FileStream fs = File.Create(path); | 593 | FileStream fs = File.Create(path); |
| 594 | System.Text.ASCIIEncoding enc = new System.Text.ASCIIEncoding(); | 594 | |
| 595 | Byte[] buf = enc.GetBytes(pidstring); | 595 | Byte[] buf = Encoding.ASCII.GetBytes(pidstring); |
| 596 | fs.Write(buf, 0, buf.Length); | 596 | fs.Write(buf, 0, buf.Length); |
| 597 | fs.Close(); | 597 | fs.Close(); |
| 598 | m_pidFile = path; | 598 | m_pidFile = path; |