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/OpenSimDefaults.ini | |
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 'bin/OpenSimDefaults.ini')
-rw-r--r-- | bin/OpenSimDefaults.ini | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini index aa3b1a1..f4ea2a5 100644 --- a/bin/OpenSimDefaults.ini +++ b/bin/OpenSimDefaults.ini | |||
@@ -94,6 +94,10 @@ | |||
94 | ; If a viewer attempts to rez a prim larger than the non-physical or physical prim max, clamp the dimensions to the appropriate maximum | 94 | ; If a viewer attempts to rez a prim larger than the non-physical or physical prim max, clamp the dimensions to the appropriate maximum |
95 | ; This can be overriden in the region config file. | 95 | ; This can be overriden in the region config file. |
96 | ClampPrimSize = false | 96 | ClampPrimSize = false |
97 | |||
98 | ; Maximum number of prims allowable in a linkset. Affects creating new linksets. Ignored if less than or equal to zero. | ||
99 | ; This can be overriden in the region config file. | ||
100 | LinksetPrims = 0 | ||
97 | 101 | ||
98 | ; Allow scripts to keep running when they cross region boundaries, rather than being restarted. State is reloaded on the destination region. | 102 | ; Allow scripts to keep running when they cross region boundaries, rather than being restarted. State is reloaded on the destination region. |
99 | ; This only applies when crossing to a region running in a different simulator. | 103 | ; This only applies when crossing to a region running in a different simulator. |