ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-07 17:55:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into careminster

Browse Source 
Conflicts:
	.gitignore
	OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
	OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
	prebuild.xml
	runprebuild.bat
This commit is contained in:
Melanie
2013-11-23 19:13:22 +00:00
parent 91b70bf3fe 60e049ea39
commit 3589acdab1
76 changed files with 10917 additions and 9834 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bin/OpenSim.ini.example
View File

@@ -69,7 +69,7 @@
;# {PIDFile} {} {Path to PID file?} {}
;; Place to create a PID file
; PIDFile = "/tmp/my.pid"
; PIDFile = "/tmp/OpenSim.exe.pid"
;# {region_info_source} {} {Where to load region from?} {filesystem web} filesystem
;; Determine where OpenSimulator looks for the files which tell it