diff options
author | Melanie | 2012-09-09 13:30:24 +0100 |
---|---|---|
committer | Melanie | 2012-09-09 13:30:24 +0100 |
commit | 0d97beefce9eaa675c93504b7cb8230e75e17763 (patch) | |
tree | 587516c2fdf96179c93a0d37624a8d3a9f7bebdd /bin/OpenSim.ini.example | |
parent | Merge branch 'master' into careminster (diff) | |
parent | implementing per-region configuration of limits on the number of prims one ca... (diff) | |
download | opensim-SC_OLD-0d97beefce9eaa675c93504b7cb8230e75e17763.zip opensim-SC_OLD-0d97beefce9eaa675c93504b7cb8230e75e17763.tar.gz opensim-SC_OLD-0d97beefce9eaa675c93504b7cb8230e75e17763.tar.bz2 opensim-SC_OLD-0d97beefce9eaa675c93504b7cb8230e75e17763.tar.xz |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
Diffstat (limited to '')
-rw-r--r-- | bin/OpenSim.ini.example | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example index eac30b8..f0ebcce 100644 --- a/bin/OpenSim.ini.example +++ b/bin/OpenSim.ini.example | |||
@@ -107,6 +107,11 @@ | |||
107 | ;; If a viewer attempts to rez a prim larger than the non-physical or physical prim max, clamp the dimensions to the appropriate maximum | 107 | ;; If a viewer attempts to rez a prim larger than the non-physical or physical prim max, clamp the dimensions to the appropriate maximum |
108 | ;; This can be overriden in the region config file. | 108 | ;; This can be overriden in the region config file. |
109 | ; ClampPrimSize = false | 109 | ; ClampPrimSize = false |
110 | |||
111 | ;# {LinksetPrims} {} {Max prims an object will hold?} {} 0 | ||
112 | ;; Maximum number of prims allowable in a linkset. Affects creating new linksets. Ignored if less than or equal to zero. | ||
113 | ;; This can be overriden in the region config file. | ||
114 | ; LinksetPrims = 0 | ||
110 | 115 | ||
111 | ;# {AllowScriptCrossing} {} {Allow scripts to cross into this region} {true false} true | 116 | ;# {AllowScriptCrossing} {} {Allow scripts to cross into this region} {true false} true |
112 | ;; Allow scripts to keep running when they cross region boundaries, rather than being restarted. State is reloaded on the destination region. | 117 | ;; Allow scripts to keep running when they cross region boundaries, rather than being restarted. State is reloaded on the destination region. |