diff options
| author | Justin Clark-Casey (justincc) | 2013-01-29 03:59:38 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2013-01-29 03:59:38 +0000 |
| commit | 77cd74ded645e8f479a81ba6cb1456f6cace7a67 (patch) | |
| tree | 15c197fb8800aa2d2f69c9563ba72d646831a43f /OpenSim/Region/Physics/OdePlugin | |
| parent | minor: remove some mono compile warnings in XEngine.cs (diff) | |
| parent | BulletSim: enable angular vertical attraction. (diff) | |
| download | opensim-SC-77cd74ded645e8f479a81ba6cb1456f6cace7a67.zip opensim-SC-77cd74ded645e8f479a81ba6cb1456f6cace7a67.tar.gz opensim-SC-77cd74ded645e8f479a81ba6cb1456f6cace7a67.tar.bz2 opensim-SC-77cd74ded645e8f479a81ba6cb1456f6cace7a67.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Physics/OdePlugin')
| -rw-r--r-- | OpenSim/Region/Physics/OdePlugin/OdeScene.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/OdeScene.cs b/OpenSim/Region/Physics/OdePlugin/OdeScene.cs index 02a0b15..6d7f079 100644 --- a/OpenSim/Region/Physics/OdePlugin/OdeScene.cs +++ b/OpenSim/Region/Physics/OdePlugin/OdeScene.cs | |||
| @@ -4096,8 +4096,8 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
| 4096 | lock (_prims) | 4096 | lock (_prims) |
| 4097 | { | 4097 | { |
| 4098 | List<OdePrim> orderedPrims = new List<OdePrim>(_prims); | 4098 | List<OdePrim> orderedPrims = new List<OdePrim>(_prims); |
| 4099 | orderedPrims.OrderByDescending(p => p.CollisionScore).Take(25); | 4099 | orderedPrims.OrderByDescending(p => p.CollisionScore); |
| 4100 | topColliders = orderedPrims.ToDictionary(p => p.LocalID, p => p.CollisionScore); | 4100 | topColliders = orderedPrims.Take(25).ToDictionary(p => p.LocalID, p => p.CollisionScore); |
| 4101 | 4101 | ||
| 4102 | foreach (OdePrim p in _prims) | 4102 | foreach (OdePrim p in _prims) |
| 4103 | p.CollisionScore = 0; | 4103 | p.CollisionScore = 0; |