diff options
| author | Robert Adams | 2015-09-08 04:54:16 -0700 |
|---|---|---|
| committer | Robert Adams | 2015-09-08 04:54:16 -0700 |
| commit | e5367d822be9b05e74c859afe2d2956a3e95aa33 (patch) | |
| tree | e904050a30715df587aa527d7f313755177726a7 /OpenSim/Region/Framework/Scenes/EventManager.cs | |
| parent | add lost admin_reset_land method (diff) | |
| parent | Deleted access control spec from [LoginService] section of standalone config.... (diff) | |
| download | opensim-SC_OLD-e5367d822be9b05e74c859afe2d2956a3e95aa33.zip opensim-SC_OLD-e5367d822be9b05e74c859afe2d2956a3e95aa33.tar.gz opensim-SC_OLD-e5367d822be9b05e74c859afe2d2956a3e95aa33.tar.bz2 opensim-SC_OLD-e5367d822be9b05e74c859afe2d2956a3e95aa33.tar.xz | |
Merge of ubitworkvarnew with opensim/master as of 20150905.
This integrates the OpenSim refactoring to make physics, etc into modules.
AVN physics hasn't been moved to new location.
Does not compile yet.
Merge branch 'osmaster' into mbworknew1
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/EventManager.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/EventManager.cs | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/OpenSim/Region/Framework/Scenes/EventManager.cs b/OpenSim/Region/Framework/Scenes/EventManager.cs index 22b8e4d..0a6bca4 100644 --- a/OpenSim/Region/Framework/Scenes/EventManager.cs +++ b/OpenSim/Region/Framework/Scenes/EventManager.cs | |||
| @@ -635,8 +635,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 635 | /// Triggered by <see cref="TriggerScriptCollidingStart"/> | 635 | /// Triggered by <see cref="TriggerScriptCollidingStart"/> |
| 636 | /// in <see cref="SceneObjectPart.SendCollisionEvent"/> | 636 | /// in <see cref="SceneObjectPart.SendCollisionEvent"/> |
| 637 | /// via <see cref="SceneObjectPart.PhysicsCollision"/> | 637 | /// via <see cref="SceneObjectPart.PhysicsCollision"/> |
| 638 | /// via <see cref="OpenSim.Region.Physics.Manager.PhysicsActor.OnCollisionUpdate"/> | 638 | /// via <see cref="OpenSim.Region.PhysicsModule.SharedBase.PhysicsActor.OnCollisionUpdate"/> |
| 639 | /// via <see cref="OpenSim.Region.Physics.Manager.PhysicsActor.SendCollisionUpdate"/> | 639 | /// via <see cref="OpenSim.Region.PhysicsModule.SharedBase.PhysicsActor.SendCollisionUpdate"/> |
| 640 | /// </remarks> | 640 | /// </remarks> |
| 641 | public event ScriptColliding OnScriptColliderStart; | 641 | public event ScriptColliding OnScriptColliderStart; |
| 642 | 642 | ||
| @@ -649,8 +649,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 649 | /// Triggered by <see cref="TriggerScriptColliding"/> | 649 | /// Triggered by <see cref="TriggerScriptColliding"/> |
| 650 | /// in <see cref="SceneObjectPart.SendCollisionEvent"/> | 650 | /// in <see cref="SceneObjectPart.SendCollisionEvent"/> |
| 651 | /// via <see cref="SceneObjectPart.PhysicsCollision"/> | 651 | /// via <see cref="SceneObjectPart.PhysicsCollision"/> |
| 652 | /// via <see cref="OpenSim.Region.Physics.Manager.PhysicsActor.OnCollisionUpdate"/> | 652 | /// via <see cref="OpenSim.Region.PhysicsModule.SharedBase.PhysicsActor.OnCollisionUpdate"/> |
| 653 | /// via <see cref="OpenSim.Region.Physics.Manager.PhysicsActor.SendCollisionUpdate"/> | 653 | /// via <see cref="OpenSim.Region.PhysicsModule.SharedBase.PhysicsActor.SendCollisionUpdate"/> |
| 654 | /// </remarks> | 654 | /// </remarks> |
| 655 | public event ScriptColliding OnScriptColliding; | 655 | public event ScriptColliding OnScriptColliding; |
| 656 | 656 | ||
| @@ -662,8 +662,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 662 | /// Triggered by <see cref="TriggerScriptCollidingEnd"/> | 662 | /// Triggered by <see cref="TriggerScriptCollidingEnd"/> |
| 663 | /// in <see cref="SceneObjectPart.SendCollisionEvent"/> | 663 | /// in <see cref="SceneObjectPart.SendCollisionEvent"/> |
| 664 | /// via <see cref="SceneObjectPart.PhysicsCollision"/> | 664 | /// via <see cref="SceneObjectPart.PhysicsCollision"/> |
| 665 | /// via <see cref="OpenSim.Region.Physics.Manager.PhysicsActor.OnCollisionUpdate"/> | 665 | /// via <see cref="OpenSim.Region.PhysicsModule.SharedBase.PhysicsActor.OnCollisionUpdate"/> |
| 666 | /// via <see cref="OpenSim.Region.Physics.Manager.PhysicsActor.SendCollisionUpdate"/> | 666 | /// via <see cref="OpenSim.Region.PhysicsModule.SharedBase.PhysicsActor.SendCollisionUpdate"/> |
| 667 | /// </remarks> | 667 | /// </remarks> |
| 668 | public event ScriptColliding OnScriptCollidingEnd; | 668 | public event ScriptColliding OnScriptCollidingEnd; |
| 669 | 669 | ||
| @@ -675,8 +675,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 675 | /// Triggered by <see cref="TriggerScriptLandCollidingStart"/> | 675 | /// Triggered by <see cref="TriggerScriptLandCollidingStart"/> |
| 676 | /// in <see cref="SceneObjectPart.SendLandCollisionEvent"/> | 676 | /// in <see cref="SceneObjectPart.SendLandCollisionEvent"/> |
| 677 | /// via <see cref="SceneObjectPart.PhysicsCollision"/> | 677 | /// via <see cref="SceneObjectPart.PhysicsCollision"/> |
| 678 | /// via <see cref="OpenSim.Region.Physics.Manager.PhysicsActor.OnCollisionUpdate"/> | 678 | /// via <see cref="OpenSim.Region.PhysicsModule.SharedBase.PhysicsActor.OnCollisionUpdate"/> |
| 679 | /// via <see cref="OpenSim.Region.Physics.Manager.PhysicsActor.SendCollisionUpdate"/> | 679 | /// via <see cref="OpenSim.Region.PhysicsModule.SharedBase.PhysicsActor.SendCollisionUpdate"/> |
| 680 | /// </remarks> | 680 | /// </remarks> |
| 681 | public event ScriptColliding OnScriptLandColliderStart; | 681 | public event ScriptColliding OnScriptLandColliderStart; |
| 682 | 682 | ||
| @@ -688,8 +688,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 688 | /// Triggered by <see cref="TriggerScriptLandColliding"/> | 688 | /// Triggered by <see cref="TriggerScriptLandColliding"/> |
| 689 | /// in <see cref="SceneObjectPart.SendLandCollisionEvent"/> | 689 | /// in <see cref="SceneObjectPart.SendLandCollisionEvent"/> |
| 690 | /// via <see cref="SceneObjectPart.PhysicsCollision"/> | 690 | /// via <see cref="SceneObjectPart.PhysicsCollision"/> |
| 691 | /// via <see cref="OpenSim.Region.Physics.Manager.PhysicsActor.OnCollisionUpdate"/> | 691 | /// via <see cref="OpenSim.Region.PhysicsModule.SharedBase.PhysicsActor.OnCollisionUpdate"/> |
| 692 | /// via <see cref="OpenSim.Region.Physics.Manager.PhysicsActor.SendCollisionUpdate"/> | 692 | /// via <see cref="OpenSim.Region.PhysicsModule.SharedBase.PhysicsActor.SendCollisionUpdate"/> |
| 693 | /// </remarks> | 693 | /// </remarks> |
| 694 | public event ScriptColliding OnScriptLandColliding; | 694 | public event ScriptColliding OnScriptLandColliding; |
| 695 | 695 | ||
| @@ -701,8 +701,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 701 | /// Triggered by <see cref="TriggerScriptLandCollidingEnd"/> | 701 | /// Triggered by <see cref="TriggerScriptLandCollidingEnd"/> |
| 702 | /// in <see cref="SceneObjectPart.SendLandCollisionEvent"/> | 702 | /// in <see cref="SceneObjectPart.SendLandCollisionEvent"/> |
| 703 | /// via <see cref="SceneObjectPart.PhysicsCollision"/> | 703 | /// via <see cref="SceneObjectPart.PhysicsCollision"/> |
| 704 | /// via <see cref="OpenSim.Region.Physics.Manager.PhysicsActor.OnCollisionUpdate"/> | 704 | /// via <see cref="OpenSim.Region.PhysicsModule.SharedBase.PhysicsActor.OnCollisionUpdate"/> |
| 705 | /// via <see cref="OpenSim.Region.Physics.Manager.PhysicsActor.SendCollisionUpdate"/> | 705 | /// via <see cref="OpenSim.Region.PhysicsModule.SharedBase.PhysicsActor.SendCollisionUpdate"/> |
| 706 | /// </remarks> | 706 | /// </remarks> |
| 707 | public event ScriptColliding OnScriptLandColliderEnd; | 707 | public event ScriptColliding OnScriptLandColliderEnd; |
| 708 | 708 | ||