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/OpenSim.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/OpenSim.ini.example | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example index 16c9061..2e2392b 100644 --- a/bin/OpenSim.ini.example +++ b/bin/OpenSim.ini.example | |||
| @@ -69,7 +69,7 @@ | |||
| 69 | 69 | ||
| 70 | ;# {PIDFile} {} {Path to PID file?} {} | 70 | ;# {PIDFile} {} {Path to PID file?} {} |
| 71 | ;; Place to create a PID file | 71 | ;; Place to create a PID file |
| 72 | ; PIDFile = "/tmp/my.pid" | 72 | ; PIDFile = "/tmp/OpenSim.exe.pid" |
| 73 | 73 | ||
| 74 | ;# {region_info_source} {} {Where to load region from?} {filesystem web} filesystem | 74 | ;# {region_info_source} {} {Where to load region from?} {filesystem web} filesystem |
| 75 | ;; Determine where OpenSimulator looks for the files which tell it | 75 | ;; Determine where OpenSimulator looks for the files which tell it |