diff options
| author | Melanie | 2013-01-25 00:10:32 +0000 |
|---|---|---|
| committer | Melanie | 2013-01-25 00:10:32 +0000 |
| commit | 0b8bf69470aa461ac8b6554dce5e56427f39ac74 (patch) | |
| tree | 9e2175c461425d1abc6ffbdb7d19278a9bf82c2e /OpenSim/Region/Physics/BulletSPlugin/BSScene.cs | |
| parent | Merge branch 'avination' into careminster (diff) | |
| parent | BulletSim: reduce the zeroing threshold for rotational velocity. (diff) | |
| download | opensim-SC_OLD-0b8bf69470aa461ac8b6554dce5e56427f39ac74.zip opensim-SC_OLD-0b8bf69470aa461ac8b6554dce5e56427f39ac74.tar.gz opensim-SC_OLD-0b8bf69470aa461ac8b6554dce5e56427f39ac74.tar.bz2 opensim-SC_OLD-0b8bf69470aa461ac8b6554dce5e56427f39ac74.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
Diffstat (limited to 'OpenSim/Region/Physics/BulletSPlugin/BSScene.cs')
| -rw-r--r-- | OpenSim/Region/Physics/BulletSPlugin/BSScene.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs b/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs index 35dba9b..cb304b6 100644 --- a/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs | |||
| @@ -917,8 +917,8 @@ public sealed class BSScene : PhysicsScene, IPhysicsParameters | |||
| 917 | foreach (uint lID in xlIDs) | 917 | foreach (uint lID in xlIDs) |
| 918 | { | 918 | { |
| 919 | BSPhysObject theObject = null; | 919 | BSPhysObject theObject = null; |
| 920 | PhysObjects.TryGetValue(lID, out theObject); | 920 | if (PhysObjects.TryGetValue(lID, out theObject)) |
| 921 | thisParam.onObject(this, theObject, xval); | 921 | thisParam.onObject(this, theObject, xval); |
| 922 | } | 922 | } |
| 923 | } | 923 | } |
| 924 | } | 924 | } |