diff options
author | Justin Clark-Casey (justincc) | 2012-09-12 00:07:56 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2012-09-12 00:07:56 +0100 |
commit | 757d9163fa623b62f834e1684994d51f66428055 (patch) | |
tree | 718a48c936017847306b5d21f96a0b4a8b00cee7 /bin/OpenSimDefaults.ini | |
parent | Add levels 4 and 5 to "debug http" console command that will log a sample of ... (diff) | |
parent | documentation (OnSceneObjectPartCopy) (diff) | |
download | opensim-SC_OLD-757d9163fa623b62f834e1684994d51f66428055.zip opensim-SC_OLD-757d9163fa623b62f834e1684994d51f66428055.tar.gz opensim-SC_OLD-757d9163fa623b62f834e1684994d51f66428055.tar.bz2 opensim-SC_OLD-757d9163fa623b62f834e1684994d51f66428055.tar.xz |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
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 dbd3e3a..c080fbf 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. |