diff options
| author | Melanie | 2013-03-05 23:57:53 +0000 |
|---|---|---|
| committer | Melanie | 2013-03-05 23:57:53 +0000 |
| commit | 81552f41c601017f43061d923eba393b9f85a7b3 (patch) | |
| tree | 5d6c3aba0f72941c06b47eaae6f4cd0301b60b23 /bin/OpenSimDefaults.ini | |
| parent | Merge branch 'avination' into careminster (diff) | |
| parent | minor: Fix mono compiler warning in MonitorModule (diff) | |
| download | opensim-SC_OLD-81552f41c601017f43061d923eba393b9f85a7b3.zip opensim-SC_OLD-81552f41c601017f43061d923eba393b9f85a7b3.tar.gz opensim-SC_OLD-81552f41c601017f43061d923eba393b9f85a7b3.tar.bz2 opensim-SC_OLD-81552f41c601017f43061d923eba393b9f85a7b3.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/ClientStack/Linden/Caps/MeshUploadFlagModule.cs
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
OpenSim/Region/OptionalModules/Avatar/Attachments/TempAttachmentsModule.cs
Diffstat (limited to '')
| -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 5460910..a712338 100644 --- a/bin/OpenSimDefaults.ini +++ b/bin/OpenSimDefaults.ini | |||
| @@ -1396,6 +1396,10 @@ | |||
| 1396 | ; up the system to malicious scripters | 1396 | ; up the system to malicious scripters |
| 1397 | ; NotecardLineReadCharsMax = 255 | 1397 | ; NotecardLineReadCharsMax = 255 |
| 1398 | 1398 | ||
| 1399 | ; Minimum settable timer interval. Any timer setting less than this is | ||
| 1400 | ; rounded up to this minimum interval. | ||
| 1401 | ; MinTimerInterval = 0.5 | ||
| 1402 | |||
| 1399 | ; Sensor settings | 1403 | ; Sensor settings |
| 1400 | SensorMaxRange = 96.0 | 1404 | SensorMaxRange = 96.0 |
| 1401 | SensorMaxResults = 16 | 1405 | SensorMaxResults = 16 |