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/Framework/Scenes/Scene.cs
	OpenSim/Region/Framework/Scenes/ScenePresence.cs
This commit is contained in:
Melanie
2011-11-05 22:56:08 +00:00
parent 9bded61ca4 bbbcdaa462
commit facdc9c46e
3 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
bin/OpenSimDefaults.ini
View File

@@ -298,10 +298,6 @@
; won't look right until the physics engine supports it
; (i.e delays takeoff for a moment)
; This is commented so it will come on automatically once it's
; supported.
; enableprejump = true
; Simulator Stats URI
; Enable JSON simulator data by setting a URI name (case sensitive)
; Stats_URI = "jsonSimStats"