diff options
author | Melanie | 2013-04-10 13:20:55 +0100 |
---|---|---|
committer | Melanie | 2013-04-10 13:20:55 +0100 |
commit | 7cf377fff02de4504965420baaabd56b9a5379ee (patch) | |
tree | 5dde9202c352446232e53af9ce85efad4735a572 /OpenSim/Framework | |
parent | Merge branch 'master' into careminster (diff) | |
parent | BulletSim: fixing problems with llMoveToTarget. Not all fixed yet. (diff) | |
download | opensim-SC-7cf377fff02de4504965420baaabd56b9a5379ee.zip opensim-SC-7cf377fff02de4504965420baaabd56b9a5379ee.tar.gz opensim-SC-7cf377fff02de4504965420baaabd56b9a5379ee.tar.bz2 opensim-SC-7cf377fff02de4504965420baaabd56b9a5379ee.tar.xz |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Data/MySQL/MySQLAssetData.cs
OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r-- | OpenSim/Framework/Servers/ServerBase.cs | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/OpenSim/Framework/Servers/ServerBase.cs b/OpenSim/Framework/Servers/ServerBase.cs index 1ff8aca..b9e3c18 100644 --- a/OpenSim/Framework/Servers/ServerBase.cs +++ b/OpenSim/Framework/Servers/ServerBase.cs | |||
@@ -76,6 +76,11 @@ namespace OpenSim.Framework.Servers | |||
76 | 76 | ||
77 | protected void CreatePIDFile(string path) | 77 | protected void CreatePIDFile(string path) |
78 | { | 78 | { |
79 | if (File.Exists(path)) | ||
80 | m_log.ErrorFormat( | ||
81 | "[SERVER BASE]: Previous pid file {0} still exists on startup. Possibly previously unclean shutdown.", | ||
82 | path); | ||
83 | |||
79 | try | 84 | try |
80 | { | 85 | { |
81 | string pidstring = System.Diagnostics.Process.GetCurrentProcess().Id.ToString(); | 86 | string pidstring = System.Diagnostics.Process.GetCurrentProcess().Id.ToString(); |