diff options
| author | Diva Canto | 2015-11-27 08:24:39 -0800 |
|---|---|---|
| committer | Diva Canto | 2015-11-27 08:24:39 -0800 |
| commit | cade717b5ffd0445c6246a55da5e80da2562450d (patch) | |
| tree | 4e0a182d64905d35524336ee93b1283385494447 /bin | |
| parent | Sometimes the viewer sends a null string as mapName; this made the client thr... (diff) | |
| parent | add a delay to consume other change messages on move and cross (diff) | |
| download | opensim-SC_OLD-cade717b5ffd0445c6246a55da5e80da2562450d.zip opensim-SC_OLD-cade717b5ffd0445c6246a55da5e80da2562450d.tar.gz opensim-SC_OLD-cade717b5ffd0445c6246a55da5e80da2562450d.tar.bz2 opensim-SC_OLD-cade717b5ffd0445c6246a55da5e80da2562450d.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to '')
| -rw-r--r-- | bin/OpenSimDefaults.ini | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini index 09dda10..7221353 100644 --- a/bin/OpenSimDefaults.ini +++ b/bin/OpenSimDefaults.ini | |||
| @@ -138,6 +138,9 @@ | |||
| 138 | ; This can be overridden in the region config file. | 138 | ; This can be overridden in the region config file. |
| 139 | ClampPrimSize = false | 139 | ClampPrimSize = false |
| 140 | 140 | ||
| 141 | ; If a prim is loaded from an external source, clamp it to Z = 0 if Z is negative. | ||
| 142 | ClampNegativeZ = false | ||
| 143 | |||
| 141 | ; Maximum number of prims allowable in a linkset. Affects creating new linksets. Ignored if less than or equal to zero. | 144 | ; Maximum number of prims allowable in a linkset. Affects creating new linksets. Ignored if less than or equal to zero. |
| 142 | ; This can be overridden in the region config file. | 145 | ; This can be overridden in the region config file. |
| 143 | LinksetPrims = 0 | 146 | LinksetPrims = 0 |