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

Merge branch 'master' into careminster

Browse Source 
Conflicts:
	CONTRIBUTORS.txt
	OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
	OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
This commit is contained in:
Melanie
2012-09-29 19:21:07 +01:00
parent 001ec0e2e6 4e9509dafa
commit 71dd55a1ce
29 changed files with 2264 additions and 1491 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
bin/OpenSimDefaults.ini
View File

@@ -932,10 +932,10 @@
MaxPersistantManifoldPoolSize = 0
ShouldDisableContactPoolDynamicAllocation = False
ShouldForceUpdateAllAabbs = False
ShouldRandomizeSolverOrder = False
ShouldSplitSimulationIslands = False
ShouldRandomizeSolverOrder = True
ShouldSplitSimulationIslands = True
ShouldEnableFrictionCaching = False
NumberOfSolverIterations = 0;
NumberOfSolverIterations = 0
; Linkset constraint parameters
LinkConstraintUseFrameOffset = False
@@ -1033,30 +1033,31 @@
;default_appearance = default_appearance.xml
[RestPlugins]
; Change this to true to enable REST Plugins. This must be true if you wish to use
; REST Region or REST Asset and Inventory Plugins
enabled = false
god_key = SECRET
prefix = /admin
; RestPlugins are not currently operational.
;[RestPlugins]
; ; Change this to true to enable REST Plugins. This must be true if you wish to use
; ; REST Region or REST Asset and Inventory Plugins
; enabled = false
; god_key = SECRET
; prefix = /admin
[RestRegionPlugin]
; Change this to true to enable the REST Region Plugin
enabled = false
;[RestRegionPlugin]
; ; Change this to true to enable the REST Region Plugin
; enabled = false
[RestHandler]
; Change this to true to enable the REST Asset and Inventory Plugin
enabled = false
authenticate = true
secured = true
extended-escape = true
realm = OpenSim REST
dump-asset = false
path-fill = true
dump-line-size = 32
flush-on-error = true
;[RestHandler]
; ; Change this to true to enable the REST Asset and Inventory Plugin
; enabled = false
; authenticate = true
; secured = true
; extended-escape = true
; realm = OpenSim REST
; dump-asset = false
; path-fill = true
; dump-line-size = 32
; flush-on-error = true
; IRC bridge is experimental, so if it breaks... keep both parts... yada yada
@@ -1624,10 +1625,6 @@
[Terrain]
InitialTerrain = "pinhead-island"
[TOSModule]
;; Enable TOS facilities
Enabled = false
;;
;; If you are using a simian grid frontend you can enable
;; this module to upload tile images for the mapping fn