diff options
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
11 files changed, 22 insertions, 22 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs b/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs index 5beee73..b6f2d3d 100644 --- a/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs +++ b/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs | |||
@@ -35,7 +35,7 @@ using OpenMetaverse; | |||
35 | using OpenSim.Framework; | 35 | using OpenSim.Framework; |
36 | using OpenSim.Region.Framework.Interfaces; | 36 | using OpenSim.Region.Framework.Interfaces; |
37 | using OpenSim.Region.Framework.Scenes; | 37 | using OpenSim.Region.Framework.Scenes; |
38 | using OpenSim.Region.Physics.Manager; | 38 | using OpenSim.Region.PhysicsModule.SharedBase; |
39 | 39 | ||
40 | namespace OpenSim.Region.Framework.Scenes.Animation | 40 | namespace OpenSim.Region.Framework.Scenes.Animation |
41 | { | 41 | { |
diff --git a/OpenSim/Region/Framework/Scenes/EventManager.cs b/OpenSim/Region/Framework/Scenes/EventManager.cs index d325240..97b9482 100644 --- a/OpenSim/Region/Framework/Scenes/EventManager.cs +++ b/OpenSim/Region/Framework/Scenes/EventManager.cs | |||
@@ -632,8 +632,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
632 | /// Triggered by <see cref="TriggerScriptCollidingStart"/> | 632 | /// Triggered by <see cref="TriggerScriptCollidingStart"/> |
633 | /// in <see cref="SceneObjectPart.SendCollisionEvent"/> | 633 | /// in <see cref="SceneObjectPart.SendCollisionEvent"/> |
634 | /// via <see cref="SceneObjectPart.PhysicsCollision"/> | 634 | /// via <see cref="SceneObjectPart.PhysicsCollision"/> |
635 | /// via <see cref="OpenSim.Region.Physics.Manager.PhysicsActor.OnCollisionUpdate"/> | 635 | /// via <see cref="OpenSim.Region.PhysicsModule.SharedBase.PhysicsActor.OnCollisionUpdate"/> |
636 | /// via <see cref="OpenSim.Region.Physics.Manager.PhysicsActor.SendCollisionUpdate"/> | 636 | /// via <see cref="OpenSim.Region.PhysicsModule.SharedBase.PhysicsActor.SendCollisionUpdate"/> |
637 | /// </remarks> | 637 | /// </remarks> |
638 | public event ScriptColliding OnScriptColliderStart; | 638 | public event ScriptColliding OnScriptColliderStart; |
639 | 639 | ||
@@ -646,8 +646,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
646 | /// Triggered by <see cref="TriggerScriptColliding"/> | 646 | /// Triggered by <see cref="TriggerScriptColliding"/> |
647 | /// in <see cref="SceneObjectPart.SendCollisionEvent"/> | 647 | /// in <see cref="SceneObjectPart.SendCollisionEvent"/> |
648 | /// via <see cref="SceneObjectPart.PhysicsCollision"/> | 648 | /// via <see cref="SceneObjectPart.PhysicsCollision"/> |
649 | /// via <see cref="OpenSim.Region.Physics.Manager.PhysicsActor.OnCollisionUpdate"/> | 649 | /// via <see cref="OpenSim.Region.PhysicsModule.SharedBase.PhysicsActor.OnCollisionUpdate"/> |
650 | /// via <see cref="OpenSim.Region.Physics.Manager.PhysicsActor.SendCollisionUpdate"/> | 650 | /// via <see cref="OpenSim.Region.PhysicsModule.SharedBase.PhysicsActor.SendCollisionUpdate"/> |
651 | /// </remarks> | 651 | /// </remarks> |
652 | public event ScriptColliding OnScriptColliding; | 652 | public event ScriptColliding OnScriptColliding; |
653 | 653 | ||
@@ -659,8 +659,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
659 | /// Triggered by <see cref="TriggerScriptCollidingEnd"/> | 659 | /// Triggered by <see cref="TriggerScriptCollidingEnd"/> |
660 | /// in <see cref="SceneObjectPart.SendCollisionEvent"/> | 660 | /// in <see cref="SceneObjectPart.SendCollisionEvent"/> |
661 | /// via <see cref="SceneObjectPart.PhysicsCollision"/> | 661 | /// via <see cref="SceneObjectPart.PhysicsCollision"/> |
662 | /// via <see cref="OpenSim.Region.Physics.Manager.PhysicsActor.OnCollisionUpdate"/> | 662 | /// via <see cref="OpenSim.Region.PhysicsModule.SharedBase.PhysicsActor.OnCollisionUpdate"/> |
663 | /// via <see cref="OpenSim.Region.Physics.Manager.PhysicsActor.SendCollisionUpdate"/> | 663 | /// via <see cref="OpenSim.Region.PhysicsModule.SharedBase.PhysicsActor.SendCollisionUpdate"/> |
664 | /// </remarks> | 664 | /// </remarks> |
665 | public event ScriptColliding OnScriptCollidingEnd; | 665 | public event ScriptColliding OnScriptCollidingEnd; |
666 | 666 | ||
@@ -672,8 +672,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
672 | /// Triggered by <see cref="TriggerScriptLandCollidingStart"/> | 672 | /// Triggered by <see cref="TriggerScriptLandCollidingStart"/> |
673 | /// in <see cref="SceneObjectPart.SendLandCollisionEvent"/> | 673 | /// in <see cref="SceneObjectPart.SendLandCollisionEvent"/> |
674 | /// via <see cref="SceneObjectPart.PhysicsCollision"/> | 674 | /// via <see cref="SceneObjectPart.PhysicsCollision"/> |
675 | /// via <see cref="OpenSim.Region.Physics.Manager.PhysicsActor.OnCollisionUpdate"/> | 675 | /// via <see cref="OpenSim.Region.PhysicsModule.SharedBase.PhysicsActor.OnCollisionUpdate"/> |
676 | /// via <see cref="OpenSim.Region.Physics.Manager.PhysicsActor.SendCollisionUpdate"/> | 676 | /// via <see cref="OpenSim.Region.PhysicsModule.SharedBase.PhysicsActor.SendCollisionUpdate"/> |
677 | /// </remarks> | 677 | /// </remarks> |
678 | public event ScriptColliding OnScriptLandColliderStart; | 678 | public event ScriptColliding OnScriptLandColliderStart; |
679 | 679 | ||
@@ -685,8 +685,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
685 | /// Triggered by <see cref="TriggerScriptLandColliding"/> | 685 | /// Triggered by <see cref="TriggerScriptLandColliding"/> |
686 | /// in <see cref="SceneObjectPart.SendLandCollisionEvent"/> | 686 | /// in <see cref="SceneObjectPart.SendLandCollisionEvent"/> |
687 | /// via <see cref="SceneObjectPart.PhysicsCollision"/> | 687 | /// via <see cref="SceneObjectPart.PhysicsCollision"/> |
688 | /// via <see cref="OpenSim.Region.Physics.Manager.PhysicsActor.OnCollisionUpdate"/> | 688 | /// via <see cref="OpenSim.Region.PhysicsModule.SharedBase.PhysicsActor.OnCollisionUpdate"/> |
689 | /// via <see cref="OpenSim.Region.Physics.Manager.PhysicsActor.SendCollisionUpdate"/> | 689 | /// via <see cref="OpenSim.Region.PhysicsModule.SharedBase.PhysicsActor.SendCollisionUpdate"/> |
690 | /// </remarks> | 690 | /// </remarks> |
691 | public event ScriptColliding OnScriptLandColliding; | 691 | public event ScriptColliding OnScriptLandColliding; |
692 | 692 | ||
@@ -698,8 +698,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
698 | /// Triggered by <see cref="TriggerScriptLandCollidingEnd"/> | 698 | /// Triggered by <see cref="TriggerScriptLandCollidingEnd"/> |
699 | /// in <see cref="SceneObjectPart.SendLandCollisionEvent"/> | 699 | /// in <see cref="SceneObjectPart.SendLandCollisionEvent"/> |
700 | /// via <see cref="SceneObjectPart.PhysicsCollision"/> | 700 | /// via <see cref="SceneObjectPart.PhysicsCollision"/> |
701 | /// via <see cref="OpenSim.Region.Physics.Manager.PhysicsActor.OnCollisionUpdate"/> | 701 | /// via <see cref="OpenSim.Region.PhysicsModule.SharedBase.PhysicsActor.OnCollisionUpdate"/> |
702 | /// via <see cref="OpenSim.Region.Physics.Manager.PhysicsActor.SendCollisionUpdate"/> | 702 | /// via <see cref="OpenSim.Region.PhysicsModule.SharedBase.PhysicsActor.SendCollisionUpdate"/> |
703 | /// </remarks> | 703 | /// </remarks> |
704 | public event ScriptColliding OnScriptLandColliderEnd; | 704 | public event ScriptColliding OnScriptLandColliderEnd; |
705 | 705 | ||
diff --git a/OpenSim/Region/Framework/Scenes/KeyframeMotion.cs b/OpenSim/Region/Framework/Scenes/KeyframeMotion.cs index 646403f..103386c 100644 --- a/OpenSim/Region/Framework/Scenes/KeyframeMotion.cs +++ b/OpenSim/Region/Framework/Scenes/KeyframeMotion.cs | |||
@@ -36,7 +36,7 @@ using System.Threading; | |||
36 | using OpenMetaverse; | 36 | using OpenMetaverse; |
37 | using OpenSim.Framework; | 37 | using OpenSim.Framework; |
38 | using OpenSim.Region.Framework.Interfaces; | 38 | using OpenSim.Region.Framework.Interfaces; |
39 | using OpenSim.Region.Physics.Manager; | 39 | using OpenSim.Region.PhysicsModule.SharedBase; |
40 | using OpenSim.Region.Framework.Scenes.Serialization; | 40 | using OpenSim.Region.Framework.Scenes.Serialization; |
41 | using System.Runtime.Serialization.Formatters.Binary; | 41 | using System.Runtime.Serialization.Formatters.Binary; |
42 | using System.Runtime.Serialization; | 42 | using System.Runtime.Serialization; |
diff --git a/OpenSim/Region/Framework/Scenes/Prioritizer.cs b/OpenSim/Region/Framework/Scenes/Prioritizer.cs index 1b10e3c..2ca2465 100644 --- a/OpenSim/Region/Framework/Scenes/Prioritizer.cs +++ b/OpenSim/Region/Framework/Scenes/Prioritizer.cs | |||
@@ -31,7 +31,7 @@ using log4net; | |||
31 | using Nini.Config; | 31 | using Nini.Config; |
32 | using OpenSim.Framework; | 32 | using OpenSim.Framework; |
33 | using OpenMetaverse; | 33 | using OpenMetaverse; |
34 | using OpenSim.Region.Physics.Manager; | 34 | using OpenSim.Region.PhysicsModule.SharedBase; |
35 | 35 | ||
36 | /* | 36 | /* |
37 | * Steps to add a new prioritization policy: | 37 | * Steps to add a new prioritization policy: |
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 04e2664..86a5772 100755 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -47,7 +47,7 @@ using OpenSim.Framework.Console; | |||
47 | using OpenSim.Region.Framework.Interfaces; | 47 | using OpenSim.Region.Framework.Interfaces; |
48 | using OpenSim.Region.Framework.Scenes.Scripting; | 48 | using OpenSim.Region.Framework.Scenes.Scripting; |
49 | using OpenSim.Region.Framework.Scenes.Serialization; | 49 | using OpenSim.Region.Framework.Scenes.Serialization; |
50 | using OpenSim.Region.Physics.Manager; | 50 | using OpenSim.Region.PhysicsModule.SharedBase; |
51 | using Timer = System.Timers.Timer; | 51 | using Timer = System.Timers.Timer; |
52 | using TPFlags = OpenSim.Framework.Constants.TeleportFlags; | 52 | using TPFlags = OpenSim.Framework.Constants.TeleportFlags; |
53 | using GridRegion = OpenSim.Services.Interfaces.GridRegion; | 53 | using GridRegion = OpenSim.Services.Interfaces.GridRegion; |
diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs index c2e9b61..9648810 100755 --- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs +++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs | |||
@@ -34,7 +34,7 @@ using OpenMetaverse.Packets; | |||
34 | using log4net; | 34 | using log4net; |
35 | using OpenSim.Framework; | 35 | using OpenSim.Framework; |
36 | using OpenSim.Region.Framework.Scenes.Types; | 36 | using OpenSim.Region.Framework.Scenes.Types; |
37 | using OpenSim.Region.Physics.Manager; | 37 | using OpenSim.Region.PhysicsModule.SharedBase; |
38 | using OpenSim.Region.Framework.Interfaces; | 38 | using OpenSim.Region.Framework.Interfaces; |
39 | 39 | ||
40 | namespace OpenSim.Region.Framework.Scenes | 40 | namespace OpenSim.Region.Framework.Scenes |
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs index 866a43c..3be6ad2 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |||
@@ -38,7 +38,7 @@ using OpenMetaverse; | |||
38 | using OpenMetaverse.Packets; | 38 | using OpenMetaverse.Packets; |
39 | using OpenSim.Framework; | 39 | using OpenSim.Framework; |
40 | using OpenSim.Region.Framework.Interfaces; | 40 | using OpenSim.Region.Framework.Interfaces; |
41 | using OpenSim.Region.Physics.Manager; | 41 | using OpenSim.Region.PhysicsModule.SharedBase; |
42 | using OpenSim.Region.Framework.Scenes.Serialization; | 42 | using OpenSim.Region.Framework.Scenes.Serialization; |
43 | using PermissionMask = OpenSim.Framework.PermissionMask; | 43 | using PermissionMask = OpenSim.Framework.PermissionMask; |
44 | 44 | ||
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index f6e8c7f..dae8c54 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |||
@@ -42,7 +42,7 @@ using OpenSim.Framework; | |||
42 | using OpenSim.Region.Framework.Interfaces; | 42 | using OpenSim.Region.Framework.Interfaces; |
43 | using OpenSim.Region.Framework.Scenes.Scripting; | 43 | using OpenSim.Region.Framework.Scenes.Scripting; |
44 | using OpenSim.Region.Framework.Scenes.Serialization; | 44 | using OpenSim.Region.Framework.Scenes.Serialization; |
45 | using OpenSim.Region.Physics.Manager; | 45 | using OpenSim.Region.PhysicsModule.SharedBase; |
46 | using PermissionMask = OpenSim.Framework.PermissionMask; | 46 | using PermissionMask = OpenSim.Framework.PermissionMask; |
47 | 47 | ||
48 | namespace OpenSim.Region.Framework.Scenes | 48 | namespace OpenSim.Region.Framework.Scenes |
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 2f19b50..d8c6c94 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -41,7 +41,7 @@ using OpenSim.Framework.Monitoring; | |||
41 | using OpenSim.Region.Framework.Interfaces; | 41 | using OpenSim.Region.Framework.Interfaces; |
42 | using OpenSim.Region.Framework.Scenes.Animation; | 42 | using OpenSim.Region.Framework.Scenes.Animation; |
43 | using OpenSim.Region.Framework.Scenes.Types; | 43 | using OpenSim.Region.Framework.Scenes.Types; |
44 | using OpenSim.Region.Physics.Manager; | 44 | using OpenSim.Region.PhysicsModule.SharedBase; |
45 | using GridRegion = OpenSim.Services.Interfaces.GridRegion; | 45 | using GridRegion = OpenSim.Services.Interfaces.GridRegion; |
46 | using OpenSim.Services.Interfaces; | 46 | using OpenSim.Services.Interfaces; |
47 | using TeleportFlags = OpenSim.Framework.Constants.TeleportFlags; | 47 | using TeleportFlags = OpenSim.Framework.Constants.TeleportFlags; |
diff --git a/OpenSim/Region/Framework/Scenes/Serialization/SceneXmlLoader.cs b/OpenSim/Region/Framework/Scenes/Serialization/SceneXmlLoader.cs index a3485d2..53815f0 100644 --- a/OpenSim/Region/Framework/Scenes/Serialization/SceneXmlLoader.cs +++ b/OpenSim/Region/Framework/Scenes/Serialization/SceneXmlLoader.cs | |||
@@ -34,7 +34,7 @@ using OpenMetaverse; | |||
34 | using log4net; | 34 | using log4net; |
35 | using OpenSim.Framework; | 35 | using OpenSim.Framework; |
36 | using OpenSim.Region.Framework.Scenes; | 36 | using OpenSim.Region.Framework.Scenes; |
37 | using OpenSim.Region.Physics.Manager; | 37 | using OpenSim.Region.PhysicsModule.SharedBase; |
38 | 38 | ||
39 | namespace OpenSim.Region.Framework.Scenes.Serialization | 39 | namespace OpenSim.Region.Framework.Scenes.Serialization |
40 | { | 40 | { |
diff --git a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceAnimationTests.cs b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceAnimationTests.cs index 42cfa1b..5f87f4a 100644 --- a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceAnimationTests.cs +++ b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceAnimationTests.cs | |||
@@ -41,7 +41,7 @@ using OpenSim.Region.Framework.Interfaces; | |||
41 | using OpenSim.Region.CoreModules.Framework.EntityTransfer; | 41 | using OpenSim.Region.CoreModules.Framework.EntityTransfer; |
42 | using OpenSim.Region.CoreModules.World.Serialiser; | 42 | using OpenSim.Region.CoreModules.World.Serialiser; |
43 | using OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation; | 43 | using OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation; |
44 | using OpenSim.Region.Physics.Manager; | 44 | using OpenSim.Region.PhysicsModule.SharedBase; |
45 | using OpenSim.Tests.Common; | 45 | using OpenSim.Tests.Common; |
46 | 46 | ||
47 | namespace OpenSim.Region.Framework.Scenes.Tests | 47 | namespace OpenSim.Region.Framework.Scenes.Tests |