aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin/OpenSim.ini.example
diff options
context:
space:
mode:
authorMelanie2012-08-18 12:57:49 +0100
committerMelanie2012-08-18 12:57:49 +0100
commit9d6fe1224aa90896edb624d34f77d7c36b368258 (patch)
treee88deb1ab440dce0db50e8745e4171e56413959c /bin/OpenSim.ini.example
parentDo a proper null check to avoid the overloaded operator == trap (diff)
parentWhen reporting a thread timeout, create a copy of the info rather than passin... (diff)
downloadopensim-SC_OLD-9d6fe1224aa90896edb624d34f77d7c36b368258.zip
opensim-SC_OLD-9d6fe1224aa90896edb624d34f77d7c36b368258.tar.gz
opensim-SC_OLD-9d6fe1224aa90896edb624d34f77d7c36b368258.tar.bz2
opensim-SC_OLD-9d6fe1224aa90896edb624d34f77d7c36b368258.tar.xz
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
Diffstat (limited to '')
-rw-r--r--bin/OpenSim.ini.example12
1 files changed, 11 insertions, 1 deletions
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 9c68b65..eac30b8 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -87,10 +87,18 @@
87 ;; from the selected region_info_source. 87 ;; from the selected region_info_source.
88 ; allow_regionless = false 88 ; allow_regionless = false
89 89
90 ;# {NonPhysicalPrimMin} {} {Minimum size of nonphysical prims?} {} 0.01
91 ;; Minimum size for non-physical prims. Affects resizing of existing prims. This can be overriden in the region config file (as NonphysicalPrimMin!).
92 ; NonphysicalPrimMin = 0.01
93
90 ;# {NonPhysicalPrimMax} {} {Maximum size of nonphysical prims?} {} 256 94 ;# {NonPhysicalPrimMax} {} {Maximum size of nonphysical prims?} {} 256
91 ;; Maximum size for non-physical prims. Affects resizing of existing prims. This can be overriden in the region config file (as NonphysicalPrimMax!). 95 ;; Maximum size for non-physical prims. Affects resizing of existing prims. This can be overriden in the region config file (as NonphysicalPrimMax!).
92 ; NonphysicalPrimMax = 256 96 ; NonphysicalPrimMax = 256
93 97
98 ;# {PhysicalPrimMin} {} {Minimum size of physical prims?} {} 10
99 ;; Maximum size where a prim can be physical. Affects resizing of existing prims. This can be overriden in the region config file.
100 ; PhysicalPrimMin = 0.01
101
94 ;# {PhysicalPrimMax} {} {Maximum size of physical prims?} {} 10 102 ;# {PhysicalPrimMax} {} {Maximum size of physical prims?} {} 10
95 ;; Maximum size where a prim can be physical. Affects resizing of existing prims. This can be overriden in the region config file. 103 ;; Maximum size where a prim can be physical. Affects resizing of existing prims. This can be overriden in the region config file.
96 ; PhysicalPrimMax = 10 104 ; PhysicalPrimMax = 10
@@ -675,7 +683,9 @@
675 ;; Maximum number of events to queue for a script (excluding timers) 683 ;; Maximum number of events to queue for a script (excluding timers)
676 ; MaxScriptEventQueue = 300 684 ; MaxScriptEventQueue = 300
677 685
678 ;; Stack size per thread created 686 ;; Stack size per script engine thread in bytes.
687 ;; If you are experiencing StackOverflowExceptions you may want to increase this (e.g. double it).
688 ;; The trade-off may be increased memory usage by the script engine.
679 ; ThreadStackSize = 262144 689 ; ThreadStackSize = 262144
680 690
681 ;# {DeleteScriptsOnStartup} {} {Delete previously compiled script DLLs on startup?} (true false) true 691 ;# {DeleteScriptsOnStartup} {} {Delete previously compiled script DLLs on startup?} (true false) true