diff options
| author | Melanie | 2009-10-12 15:11:01 +0100 |
|---|---|---|
| committer | Melanie | 2009-10-12 15:11:01 +0100 |
| commit | 50f509d600dd0fe172d5c026a42e229fbcdc3fcd (patch) | |
| tree | 847569e552590333b2d1cb837705050c029cd797 /OpenSim/Region/Physics/OdePlugin/OdePlugin.cs | |
| parent | Merge branch 'master' into vehicles (diff) | |
| parent | Fix selling objects (diff) | |
| download | opensim-SC_OLD-50f509d600dd0fe172d5c026a42e229fbcdc3fcd.zip opensim-SC_OLD-50f509d600dd0fe172d5c026a42e229fbcdc3fcd.tar.gz opensim-SC_OLD-50f509d600dd0fe172d5c026a42e229fbcdc3fcd.tar.bz2 opensim-SC_OLD-50f509d600dd0fe172d5c026a42e229fbcdc3fcd.tar.xz | |
Merge branch 'master' into vehicles
Diffstat (limited to 'OpenSim/Region/Physics/OdePlugin/OdePlugin.cs')
| -rw-r--r-- | OpenSim/Region/Physics/OdePlugin/OdePlugin.cs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs index 57e1349..78831f8 100644 --- a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs +++ b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs | |||
| @@ -2940,6 +2940,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
| 2940 | { | 2940 | { |
| 2941 | case ActorTypes.Agent: | 2941 | case ActorTypes.Agent: |
| 2942 | OdeCharacter cobj = (OdeCharacter)obj; | 2942 | OdeCharacter cobj = (OdeCharacter)obj; |
| 2943 | cobj.AddCollisionFrameTime(100); | ||
| 2943 | cobj.SendCollisions(); | 2944 | cobj.SendCollisions(); |
| 2944 | break; | 2945 | break; |
| 2945 | case ActorTypes.Prim: | 2946 | case ActorTypes.Prim: |