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

Merge branch 'master' into bulletsim

Browse Source 
Conflicts:
	OpenSim/Region/Framework/Scenes/SceneManager.cs
This commit is contained in:
Mic Bowman
2011-08-19 14:49:16 -07:00
parent fef73a1a10 a0a0c64cb1
commit 384cb79a1a
111 changed files with 2656 additions and 1160 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
bin/OpenSimDefaults.ini
View File

@@ -217,6 +217,9 @@
;WorldMapModule = "WorldMap"
;MapImageModule = "MapImageModule"
; World map blacklist timeout in seconds
;BlacklistTimeout = 600
; Set to false to not generate any maptiles
;GenerateMaptiles = true