OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Some cleanup to OpenSimDefaults.ini 

Fixing a couple of errors
viewer-2-initial-appearance
BlueWall 2010-09-26 00:21:28 -04:00 committed by Melanie
parent 51e03617e9
commit 8afa21cef0
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
bin/OpenSimDefaults.ini
View File

@ -136,6 +136,10 @@
meshing = Meshmerizer meshing = Meshmerizer
;meshing = ZeroMesher ;meshing = ZeroMesher
;; Path to decoded sculpty maps
;; Defaults to "j2kDecodeCache
;DecodedSculpMapPath = "j2kDecodeCache"
; Choose one of the physics engines below ; Choose one of the physics engines below
; OpenDynamicsEngine is by some distance the most developed physics engine ; OpenDynamicsEngine is by some distance the most developed physics engine
; basicphysics effectively does not model physics at all, making all objects phantom ; basicphysics effectively does not model physics at all, making all objects phantom
@ -999,9 +1003,14 @@
; false to allow script controlled underground positioning of ; false to allow script controlled underground positioning of
; prims ; prims
; DisableUndergroundMovement = true ; DisableUndergroundMovement = true
<<<<<<< HEAD:bin/OpenSimDefaults.ini
; Path to script engine assemblies ; Path to script engine assemblies
; Default is ./bin/ScriptEngines ; Default is ./bin/ScriptEngines
=======
;; Path to script assemblies
>>>>>>> 298b4c0... Some cleanup to OpenSimDefaults.ini:OpenSim/Region/Application/OpenSimDefaults.ini
; ScriptEnginesPath = "ScriptEngines" ; ScriptEnginesPath = "ScriptEngines"
[OpenGridProtocol] [OpenGridProtocol]