diff options
| author | Melanie | 2012-08-03 16:46:11 +0100 |
|---|---|---|
| committer | Melanie | 2012-08-03 16:46:11 +0100 |
| commit | 0c00abcce18d00ae151a7340b808ffe8d7e200ef (patch) | |
| tree | 3f19d7653c984120f16b3a2ea74ccf6b34928a2e /bin/OpenSimDefaults.ini | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | refactor: rename SOG.RezzingObjectID to SOG.FromPartID to match FromFolderID,... (diff) | |
| download | opensim-SC_OLD-0c00abcce18d00ae151a7340b808ffe8d7e200ef.zip opensim-SC_OLD-0c00abcce18d00ae151a7340b808ffe8d7e200ef.tar.gz opensim-SC_OLD-0c00abcce18d00ae151a7340b808ffe8d7e200ef.tar.bz2 opensim-SC_OLD-0c00abcce18d00ae151a7340b808ffe8d7e200ef.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
Diffstat (limited to 'bin/OpenSimDefaults.ini')
| -rw-r--r-- | bin/OpenSimDefaults.ini | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini index 80d17d9..ced0bce 100644 --- a/bin/OpenSimDefaults.ini +++ b/bin/OpenSimDefaults.ini | |||
| @@ -937,7 +937,7 @@ | |||
| 937 | FixedTimeStep = .01667 | 937 | FixedTimeStep = .01667 |
| 938 | 938 | ||
| 939 | MaxCollisionsPerFrame = 2048 | 939 | MaxCollisionsPerFrame = 2048 |
| 940 | MaxUpdatesPerFrame = 8192 | 940 | MaxUpdatesPerFrame = 2048 |
| 941 | 941 | ||
| 942 | [RemoteAdmin] | 942 | [RemoteAdmin] |
| 943 | enabled = false | 943 | enabled = false |