diff options
author | John Hurliman | 2009-10-29 01:46:58 -0700 |
---|---|---|
committer | John Hurliman | 2009-10-29 01:46:58 -0700 |
commit | 713287707595061d7ce343db73edf3462d2d29fc (patch) | |
tree | a70f73db1603cf233893645293ca0a0ca715c4cb /OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |
parent | Small performance tweaks to code called by the heartbeat loop (diff) | |
download | opensim-SC_OLD-713287707595061d7ce343db73edf3462d2d29fc.zip opensim-SC_OLD-713287707595061d7ce343db73edf3462d2d29fc.tar.gz opensim-SC_OLD-713287707595061d7ce343db73edf3462d2d29fc.tar.bz2 opensim-SC_OLD-713287707595061d7ce343db73edf3462d2d29fc.tar.xz |
* Log progress messages when loading OAR files with a lot of assets
* Change the PhysicsCollision callback for objects to send full contact point information. This will be used to calculate the collision plane for avatars
* Send the physics engine velocity in terse updates, not the current force being applied to the avatar. This should fix several issues including crouching through the floor and walking through walls
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index cf1c394..3d41666 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |||
@@ -1817,7 +1817,7 @@ if (m_shape != null) { | |||
1817 | } | 1817 | } |
1818 | 1818 | ||
1819 | CollisionEventUpdate a = (CollisionEventUpdate)e; | 1819 | CollisionEventUpdate a = (CollisionEventUpdate)e; |
1820 | Dictionary<uint, float> collissionswith = a.m_objCollisionList; | 1820 | Dictionary<uint, ContactPoint> collissionswith = a.m_objCollisionList; |
1821 | List<uint> thisHitColliders = new List<uint>(); | 1821 | List<uint> thisHitColliders = new List<uint>(); |
1822 | List<uint> endedColliders = new List<uint>(); | 1822 | List<uint> endedColliders = new List<uint>(); |
1823 | List<uint> startedColliders = new List<uint>(); | 1823 | List<uint> startedColliders = new List<uint>(); |