aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin/OpenSim.ini.example
diff options
context:
space:
mode:
authorRobert Adams2013-11-08 20:55:28 -0800
committerRobert Adams2013-11-08 20:55:28 -0800
commit7061784cc67966e49cd0057be499fda22879c783 (patch)
tree7acaa98e43fa9b4e4965b78a288017d650dd7e07 /bin/OpenSim.ini.example
parentvarregion: elimination of Constants.RegionSize from all over OpenSimulator. (diff)
parentAdd initial test for checking that specifying a parameter in LSL state_entry(... (diff)
downloadopensim-SC-7061784cc67966e49cd0057be499fda22879c783.zip
opensim-SC-7061784cc67966e49cd0057be499fda22879c783.tar.gz
opensim-SC-7061784cc67966e49cd0057be499fda22879c783.tar.bz2
opensim-SC-7061784cc67966e49cd0057be499fda22879c783.tar.xz
Merge branch 'master' into varregion
Diffstat (limited to '')
-rw-r--r--bin/OpenSim.ini.example2
1 files changed, 1 insertions, 1 deletions
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index b78e3b7..d3f9156 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