diff options
| author | Melanie | 2012-09-16 04:11:20 +0100 |
|---|---|---|
| committer | Melanie | 2012-09-16 04:11:20 +0100 |
| commit | db774d4292588db1e2ac4a9fafe977ddbec353ee (patch) | |
| tree | 5fc381d7cb96cc0d2b47e4807821f488c339ec13 /bin/OpenSimDefaults.ini | |
| parent | Merge branch 'avination' into careminster (diff) | |
| parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC-db774d4292588db1e2ac4a9fafe977ddbec353ee.zip opensim-SC-db774d4292588db1e2ac4a9fafe977ddbec353ee.tar.gz opensim-SC-db774d4292588db1e2ac4a9fafe977ddbec353ee.tar.bz2 opensim-SC-db774d4292588db1e2ac4a9fafe977ddbec353ee.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs
OpenSim/Region/Framework/Scenes/EventManager.cs
Diffstat (limited to '')
| -rw-r--r-- | bin/OpenSimDefaults.ini | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini index f4ea2a5..1dc3f15 100644 --- a/bin/OpenSimDefaults.ini +++ b/bin/OpenSimDefaults.ini | |||
| @@ -95,9 +95,9 @@ | |||
| 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 | 97 | ||
| 98 | ; Maximum number of prims allowable in a linkset. Affects creating new linksets. Ignored if less than or equal to zero. | 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. | 99 | ; This can be overriden in the region config file. |
| 100 | LinksetPrims = 0 | 100 | LinksetPrims = 0 |
| 101 | 101 | ||
| 102 | ; 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. |
| 103 | ; 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. |