diff options
author | Diva Canto | 2009-10-10 06:36:10 -0700 |
---|---|---|
committer | Diva Canto | 2009-10-10 06:36:10 -0700 |
commit | 01783877ec3bf1f0adff6801894e5786f1312284 (patch) | |
tree | c430883e7dfc3a3e3b56d60d6adce5688a409142 /OpenSim/Region/Physics/OdePlugin/OdePlugin.cs | |
parent | Use Util.UTF8 instead of creating a new heap object every time. (diff) | |
parent | Fix selling objects (diff) | |
download | opensim-SC_OLD-01783877ec3bf1f0adff6801894e5786f1312284.zip opensim-SC_OLD-01783877ec3bf1f0adff6801894e5786f1312284.tar.gz opensim-SC_OLD-01783877ec3bf1f0adff6801894e5786f1312284.tar.bz2 opensim-SC_OLD-01783877ec3bf1f0adff6801894e5786f1312284.tar.xz |
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
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: |