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

Merge branch 'master' into bigmerge

Browse Source 
Conflicts:
	OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
This commit is contained in:
Melanie
2011-11-01 23:54:09 +00:00
parent 4002e205cb 4b58d4ff95
commit b69f679122
19 changed files with 256 additions and 818 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
bin/OpenSimDefaults.ini
View File

@@ -170,9 +170,6 @@
; Objects will always be considered for persistance in the next sweep if the first change occurred this number of seconds ago
MaximumTimeBeforePersistenceConsidered = 600
; Should avatars in neighbor sims see objects in this sim?
see_into_this_sim_from_neighbor = true
; ##
; ## PHYSICS
; ##