Merge branch 'master' into bulletsim4

2 files changed, 30 insertions, 25 deletions

diff --git a/bin/Robust.HG.ini.example b/bin/Robust.HG.ini.example
index 581c31d..d74f205 100644
--- a/bin/Robust.HG.ini.example
+++ b/bin/Robust.HG.ini.example
@@ -21,18 +21,21 @@
 ; * [[<ConfigName>@]<port>/]<dll name>[:<class name>]
 ; *
 [Startup]
-
-        ; Plugin Registry Location
-        ; Set path to directory for plugin registry. Information
-        ; about the registered repositories and installed plugins
-        ; will be stored here
-        ; The Robust.exe process must have R/W access to the location 
-        RegistryLocation = "."
-
-        ; Modular configurations
-        ; Set path to directory for modular ini files...
-        ; The Robust.exe process must have R/W access to the location 
-        ConfigDirectory = "/home/opensim/etc/Configs"
+  ; Place to create a PID file
+  ; If no path if specified then a PID file is not created.
+  ; PIDFile = "/tmp/my.pid"
+
+  ; Plugin Registry Location
+  ; Set path to directory for plugin registry. Information
+  ; about the registered repositories and installed plugins
+  ; will be stored here
+  ; The Robust.exe process must have R/W access to the location 
+  RegistryLocation = "."
+
+  ; Modular configurations
+  ; Set path to directory for modular ini files...
+  ; The Robust.exe process must have R/W access to the location 
+  ConfigDirectory = "/home/opensim/etc/Configs"
 
 [ServiceList]
 
diff --git a/bin/Robust.ini.example b/bin/Robust.ini.example
index b98132e..b7b2524 100644
--- a/bin/Robust.ini.example
+++ b/bin/Robust.ini.example
@@ -13,19 +13,21 @@
 ; * [[<ConfigName>@]<port>/]<dll name>[:<class name>]
 ; *
 [Startup]
-
-        ; Plugin Registry Location
-        ; Set path to directory for plugin registry. Information
-        ; about the registered repositories and installed plugins
-        ; will be stored here
-        ; The Robust.exe process must have R/W access to the location 
-        RegistryLocation = "."
-
-
-        ; Modular configurations
-        ; Set path to directory for modular ini files...
-        ; The Robust.exe process must have R/W access to the location 
-        ConfigDirectory = "/home/opensim/etc/Configs"
+  ; Place to create a PID file
+  ; If no path if specified then a PID file is not created.
+  ; PIDFile = "/tmp/my.pid"
+
+  ; Plugin Registry Location
+  ; Set path to directory for plugin registry. Information
+  ; about the registered repositories and installed plugins
+  ; will be stored here
+  ; The Robust.exe process must have R/W access to the location 
+  RegistryLocation = "."
+
+  ; Modular configurations
+  ; Set path to directory for modular ini files...
+  ; The Robust.exe process must have R/W access to the location 
+  ConfigDirectory = "/home/opensim/etc/Configs"
 
 [ServiceList]
 AssetServiceConnector = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector"