ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-01 06:06:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into vehicles

Browse Source
This commit is contained in:
Melanie
2009-10-12 15:11:01 +01:00
parent f6b8bac0fa ef03b2d936
commit 50f509d600
14 changed files with 667 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
OpenSim/Region/Framework/Scenes/ScenePresence.cs
View File

@@ -3409,7 +3409,7 @@ namespace OpenSim.Region.Framework.Scenes
scene.AddPhysicsActorTaint(m_physicsActor);
//m_physicsActor.OnRequestTerseUpdate += SendTerseUpdateToAllClients;
m_physicsActor.OnCollisionUpdate += PhysicsCollisionUpdate;
m_physicsActor.SubscribeEvents(1000);
m_physicsActor.SubscribeEvents(500);
m_physicsActor.LocalID = LocalId;
}
@@ -3417,7 +3417,15 @@ namespace OpenSim.Region.Framework.Scenes
// Event called by the physics plugin to tell the avatar about a collision.
private void PhysicsCollisionUpdate(EventArgs e)
{
if ((e == null) || m_invulnerable)
if (e == null)
return;
//if ((Math.Abs(Velocity.X) > 0.1e-9f) || (Math.Abs(Velocity.Y) > 0.1e-9f))
// The Physics Scene will send updates every 500 ms grep: m_physicsActor.SubscribeEvents(
// as of this comment the interval is set in AddToPhysicalScene
UpdateMovementAnimations();
if (m_invulnerable)
return;
CollisionEventUpdate collisionData = (CollisionEventUpdate)e;
Dictionary<uint, float> coldata = collisionData.m_objCollisionList;
@@ -3455,8 +3463,7 @@ namespace OpenSim.Region.Framework.Scenes
m_scene.EventManager.TriggerAvatarKill(killerObj, this);
}
if (Velocity.X > 0 || Velocity.Y > 0)
UpdateMovementAnimations();
}
public void setHealthWithUpdate(float health)