aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin
diff options
context:
space:
mode:
authorUbitUmarov2018-02-23 14:52:34 +0000
committerUbitUmarov2018-02-23 14:52:34 +0000
commit2129d941acbc5f83aca4dc4c30a62d3226888136 (patch)
treee12f2391978c923ef780f558ee5a32d857ee9124 /bin
parentMerge branch 'master' into httptests (diff)
downloadopensim-SC-2129d941acbc5f83aca4dc4c30a62d3226888136.zip
opensim-SC-2129d941acbc5f83aca4dc4c30a62d3226888136.tar.gz
opensim-SC-2129d941acbc5f83aca4dc4c30a62d3226888136.tar.bz2
opensim-SC-2129d941acbc5f83aca4dc4c30a62d3226888136.tar.xz
rename XMREngine as Yengine (still not all done), big mess source formating changes, move state files to proper folder, fix a source file locking on errors, more changes for cross platform including from Mike,... yes yes i know a messy commit
Diffstat (limited to 'bin')
-rw-r--r--bin/OpenSim.ini.example11
1 files changed, 5 insertions, 6 deletions
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index fc29304..57dd6fd 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -265,8 +265,8 @@
265 ; DefaultScriptEngine = "XEngine" 265 ; DefaultScriptEngine = "XEngine"
266 ;; ***DANGER***DANGER*** 266 ;; ***DANGER***DANGER***
267 ;; experimental engine 267 ;; experimental engine
268 ;; see section [XMREngine} below 268 ;; see section [YEngine} below
269 ; DefaultScriptEngine = "XMREngine" 269 ; DefaultScriptEngine = "YEngine"
270 270
271 ;# {HttpProxy} {} {Proxy URL for llHTTPRequest and dynamic texture loading} {} http://proxy.com:8080 271 ;# {HttpProxy} {} {Proxy URL for llHTTPRequest and dynamic texture loading} {} http://proxy.com:8080
272 ;; Http proxy setting for llHTTPRequest and dynamic texture loading, if 272 ;; Http proxy setting for llHTTPRequest and dynamic texture loading, if
@@ -922,20 +922,19 @@
922[XMREngine] 922[XMREngine]
923 ;; experimental engine 923 ;; experimental engine
924 ;; ONLY SUPORTS ONE REGION PER INSTANCE at this point 924 ;; ONLY SUPORTS ONE REGION PER INSTANCE at this point
925 ;; implements microthreading, so fixing problems like llSleep or long events handlers 925 ;; implements non preemptive microthreading, so fixing problems like llSleep or long events handlers
926 ;; but those will suffer from timeslicing, so will be slower. 926 ;; but those will suffer from timeslicing, so will be slower.
927 ;; compiles LSL directly to IL, so only suports LSL scripting (no C# etc) 927 ;; compiles LSL directly to IL, so only suports LSL scripting (no C# etc)
928 ;; shares the Xengine APIs like LSL, OSSL, etc. 928 ;; shares the Xengine APIs like LSL, OSSL, etc.
929 ;; DANGER, do not use with HG, don't leave regions running alone with it. 929 ;; DANGER, do not use with HG, don't leave regions running alone with it.
930 ;; TPs or crossings to/from Xengine will recompile scripts losing state. 930 ;; TPs or crossings to/from Xengine will full recompile scripts losing state.
931 ;; attachment scripts may misbehave, cars will stop on crossings, etc. 931 ;; attachment scripts may misbehave, cars will stop on crossings, etc.
932 Enabled = false 932 Enabled = false
933 UThreadModel = sys
934 ScriptStackSize = 256 933 ScriptStackSize = 256
935 ScriptHeapSize = 256 934 ScriptHeapSize = 256
936 UseSourceHashCode = true 935 UseSourceHashCode = true
937 MinTimerInterval = 0.1 936 MinTimerInterval = 0.1
938 ;ScriptBasePath="ScriptData" 937 ;ScriptBasePath="ScriptEngines"
939 938
940[XEngine] 939[XEngine]
941 ;# {Enabled} {} {Enable the XEngine scripting engine?} {true false} true 940 ;# {Enabled} {} {Enable the XEngine scripting engine?} {true false} true