diff options
| author | Melanie | 2013-11-23 19:13:22 +0000 |
|---|---|---|
| committer | Melanie | 2013-11-23 19:13:22 +0000 |
| commit | 3589acdab1721ee7d227a23dbeb2ccf91cbcb996 (patch) | |
| tree | a833014a1fedd774e7a9a01cd89a7edddb4210ba /bin/Robust.HG.ini.example | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Revert "Fix issue where sitting on non-root linked prims would send camera to... (diff) | |
| download | opensim-SC-3589acdab1721ee7d227a23dbeb2ccf91cbcb996.zip opensim-SC-3589acdab1721ee7d227a23dbeb2ccf91cbcb996.tar.gz opensim-SC-3589acdab1721ee7d227a23dbeb2ccf91cbcb996.tar.bz2 opensim-SC-3589acdab1721ee7d227a23dbeb2ccf91cbcb996.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
.gitignore
OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
prebuild.xml
runprebuild.bat
Diffstat (limited to '')
| -rw-r--r-- | bin/Robust.HG.ini.example | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/bin/Robust.HG.ini.example b/bin/Robust.HG.ini.example index 2ad262a..965e241 100644 --- a/bin/Robust.HG.ini.example +++ b/bin/Robust.HG.ini.example | |||
| @@ -23,7 +23,7 @@ | |||
| 23 | [Startup] | 23 | [Startup] |
| 24 | ; Place to create a PID file | 24 | ; Place to create a PID file |
| 25 | ; If no path if specified then a PID file is not created. | 25 | ; If no path if specified then a PID file is not created. |
| 26 | ; PIDFile = "/tmp/my.pid" | 26 | ; PIDFile = "/tmp/Robust.exe.pid" |
| 27 | 27 | ||
| 28 | ; Plugin Registry Location | 28 | ; Plugin Registry Location |
| 29 | ; Set path to directory for plugin registry. Information | 29 | ; Set path to directory for plugin registry. Information |