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

Some cleanup to OpenSimDefaults.ini

Browse Source 
Fixing a couple of errors
This commit is contained in:
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
Download Patch File Download Diff File Expand all files Collapse all files

9
bin/OpenSimDefaults.ini
View File

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