diff options
| author | Melanie | 2009-10-10 10:26:47 +0100 |
|---|---|---|
| committer | Melanie | 2009-10-10 10:26:47 +0100 |
| commit | 5e6e31591cfc17746f9b1d837d3cc2045c9f7766 (patch) | |
| tree | 568f45c145bf4ed1396de8df145a95ff8b947427 /OpenSim/Region/Physics/OdePlugin/OdePlugin.cs | |
| parent | * Changed the "Packet exceeded buffer size" log line to debug and include the... (diff) | |
| parent | Fix selling objects (diff) | |
| download | opensim-SC_OLD-5e6e31591cfc17746f9b1d837d3cc2045c9f7766.zip opensim-SC_OLD-5e6e31591cfc17746f9b1d837d3cc2045c9f7766.tar.gz opensim-SC_OLD-5e6e31591cfc17746f9b1d837d3cc2045c9f7766.tar.bz2 opensim-SC_OLD-5e6e31591cfc17746f9b1d837d3cc2045c9f7766.tar.xz | |
Merge branch 'master' into htb-throttle
This is hand-edited to not let master changes creep into here and may cause a
somewhat rocky merge to master later.
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 f5ab1de..083b7db 100644 --- a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs +++ b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs | |||
| @@ -2928,6 +2928,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
| 2928 | { | 2928 | { |
| 2929 | case ActorTypes.Agent: | 2929 | case ActorTypes.Agent: |
| 2930 | OdeCharacter cobj = (OdeCharacter)obj; | 2930 | OdeCharacter cobj = (OdeCharacter)obj; |
| 2931 | cobj.AddCollisionFrameTime(100); | ||
| 2931 | cobj.SendCollisions(); | 2932 | cobj.SendCollisions(); |
| 2932 | break; | 2933 | break; |
| 2933 | case ActorTypes.Prim: | 2934 | case ActorTypes.Prim: |