diff options
| author | Melanie | 2013-01-31 02:53:11 +0000 |
|---|---|---|
| committer | Melanie | 2013-01-31 02:53:11 +0000 |
| commit | 9a4de546fe92105c570d6861377ec47d32b4186e (patch) | |
| tree | edfb86074fc7c78126203a2c05a38e260c0d4076 /OpenSim/Region/Physics/OdePlugin | |
| parent | Merge branch 'avination' into careminster (diff) | |
| parent | Add JsonTestStore to determine if a JsonStore is associated with (diff) | |
| download | opensim-SC_OLD-9a4de546fe92105c570d6861377ec47d32b4186e.zip opensim-SC_OLD-9a4de546fe92105c570d6861377ec47d32b4186e.tar.gz opensim-SC_OLD-9a4de546fe92105c570d6861377ec47d32b4186e.tar.bz2 opensim-SC_OLD-9a4de546fe92105c570d6861377ec47d32b4186e.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
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; |