diff options
author | Diva Canto | 2015-08-30 21:05:36 -0700 |
---|---|---|
committer | Diva Canto | 2015-08-30 21:05:36 -0700 |
commit | ce2c67876e0ebf4f84420696f660dc77d96dea6b (patch) | |
tree | 7dc0edb3b52931842b1dc382c344ff069e925b11 | |
parent | Renamed the namespaces too (diff) | |
download | opensim-SC_OLD-ce2c67876e0ebf4f84420696f660dc77d96dea6b.zip opensim-SC_OLD-ce2c67876e0ebf4f84420696f660dc77d96dea6b.tar.gz opensim-SC_OLD-ce2c67876e0ebf4f84420696f660dc77d96dea6b.tar.bz2 opensim-SC_OLD-ce2c67876e0ebf4f84420696f660dc77d96dea6b.tar.xz |
More namespace and dll name changes. Still no functional changes.
78 files changed, 106 insertions, 106 deletions
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs index f263556..68fba97 100644 --- a/OpenSim/Region/Application/OpenSimBase.cs +++ b/OpenSim/Region/Application/OpenSimBase.cs | |||
@@ -46,7 +46,7 @@ using OpenSim.Region.CoreModules.ServiceConnectorsOut.UserAccounts; | |||
46 | using OpenSim.Region.Framework; | 46 | using OpenSim.Region.Framework; |
47 | using OpenSim.Region.Framework.Interfaces; | 47 | using OpenSim.Region.Framework.Interfaces; |
48 | using OpenSim.Region.Framework.Scenes; | 48 | using OpenSim.Region.Framework.Scenes; |
49 | using OpenSim.Region.PhysicsModule.SharedBase; | 49 | using OpenSim.Region.PhysicsModules.SharedBase; |
50 | using OpenSim.Server.Base; | 50 | using OpenSim.Server.Base; |
51 | using OpenSim.Services.Base; | 51 | using OpenSim.Services.Base; |
52 | using OpenSim.Services.Interfaces; | 52 | using OpenSim.Services.Interfaces; |
diff --git a/OpenSim/Region/ClientStack/RegionApplicationBase.cs b/OpenSim/Region/ClientStack/RegionApplicationBase.cs index b08bf4d..374e34d 100644 --- a/OpenSim/Region/ClientStack/RegionApplicationBase.cs +++ b/OpenSim/Region/ClientStack/RegionApplicationBase.cs | |||
@@ -38,7 +38,7 @@ using OpenSim.Framework.Servers.HttpServer; | |||
38 | using OpenSim.Region.Framework; | 38 | using OpenSim.Region.Framework; |
39 | using OpenSim.Region.Framework.Interfaces; | 39 | using OpenSim.Region.Framework.Interfaces; |
40 | using OpenSim.Region.Framework.Scenes; | 40 | using OpenSim.Region.Framework.Scenes; |
41 | using OpenSim.Region.PhysicsModule.SharedBase; | 41 | using OpenSim.Region.PhysicsModules.SharedBase; |
42 | using OpenSim.Services.Interfaces; | 42 | using OpenSim.Services.Interfaces; |
43 | 43 | ||
44 | namespace OpenSim.Region.ClientStack | 44 | namespace OpenSim.Region.ClientStack |
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs index 371b4f2..f3acff2 100644 --- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs +++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | |||
@@ -36,7 +36,7 @@ using OpenSim.Framework.Client; | |||
36 | using OpenSim.Framework.Monitoring; | 36 | using OpenSim.Framework.Monitoring; |
37 | using OpenSim.Region.Framework.Interfaces; | 37 | using OpenSim.Region.Framework.Interfaces; |
38 | using OpenSim.Region.Framework.Scenes; | 38 | using OpenSim.Region.Framework.Scenes; |
39 | using OpenSim.Region.PhysicsModule.SharedBase; | 39 | using OpenSim.Region.PhysicsModules.SharedBase; |
40 | using OpenSim.Services.Interfaces; | 40 | using OpenSim.Services.Interfaces; |
41 | 41 | ||
42 | using GridRegion = OpenSim.Services.Interfaces.GridRegion; | 42 | using GridRegion = OpenSim.Services.Interfaces.GridRegion; |
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferStateMachine.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferStateMachine.cs index 0f57aee..a3109e0 100644 --- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferStateMachine.cs +++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferStateMachine.cs | |||
@@ -38,7 +38,7 @@ using OpenSim.Framework.Capabilities; | |||
38 | using OpenSim.Framework.Client; | 38 | using OpenSim.Framework.Client; |
39 | using OpenSim.Region.Framework.Interfaces; | 39 | using OpenSim.Region.Framework.Interfaces; |
40 | using OpenSim.Region.Framework.Scenes; | 40 | using OpenSim.Region.Framework.Scenes; |
41 | using OpenSim.Region.PhysicsModule.SharedBase; | 41 | using OpenSim.Region.PhysicsModules.SharedBase; |
42 | using OpenSim.Services.Interfaces; | 42 | using OpenSim.Services.Interfaces; |
43 | using GridRegion = OpenSim.Services.Interfaces.GridRegion; | 43 | using GridRegion = OpenSim.Services.Interfaces.GridRegion; |
44 | 44 | ||
diff --git a/OpenSim/Region/CoreModules/World/Land/DwellModule.cs b/OpenSim/Region/CoreModules/World/Land/DwellModule.cs index bfa0320..70c6028 100644 --- a/OpenSim/Region/CoreModules/World/Land/DwellModule.cs +++ b/OpenSim/Region/CoreModules/World/Land/DwellModule.cs | |||
@@ -45,7 +45,7 @@ using OpenSim.Framework.Servers.HttpServer; | |||
45 | using OpenSim.Region.CoreModules.Framework.InterfaceCommander; | 45 | using OpenSim.Region.CoreModules.Framework.InterfaceCommander; |
46 | using OpenSim.Region.Framework.Interfaces; | 46 | using OpenSim.Region.Framework.Interfaces; |
47 | using OpenSim.Region.Framework.Scenes; | 47 | using OpenSim.Region.Framework.Scenes; |
48 | using OpenSim.Region.PhysicsModule.SharedBase; | 48 | using OpenSim.Region.PhysicsModules.SharedBase; |
49 | using OpenSim.Services.Interfaces; | 49 | using OpenSim.Services.Interfaces; |
50 | using Caps = OpenSim.Framework.Capabilities.Caps; | 50 | using Caps = OpenSim.Framework.Capabilities.Caps; |
51 | using GridRegion = OpenSim.Services.Interfaces.GridRegion; | 51 | using GridRegion = OpenSim.Services.Interfaces.GridRegion; |
diff --git a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs index f467e2a..92f6c1b 100644 --- a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs +++ b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs | |||
@@ -44,7 +44,7 @@ using OpenSim.Framework.Servers; | |||
44 | using OpenSim.Framework.Servers.HttpServer; | 44 | using OpenSim.Framework.Servers.HttpServer; |
45 | using OpenSim.Region.Framework.Interfaces; | 45 | using OpenSim.Region.Framework.Interfaces; |
46 | using OpenSim.Region.Framework.Scenes; | 46 | using OpenSim.Region.Framework.Scenes; |
47 | using OpenSim.Region.PhysicsModule.SharedBase; | 47 | using OpenSim.Region.PhysicsModules.SharedBase; |
48 | using OpenSim.Services.Interfaces; | 48 | using OpenSim.Services.Interfaces; |
49 | using Caps = OpenSim.Framework.Capabilities.Caps; | 49 | using Caps = OpenSim.Framework.Capabilities.Caps; |
50 | using GridRegion = OpenSim.Services.Interfaces.GridRegion; | 50 | using GridRegion = OpenSim.Services.Interfaces.GridRegion; |
diff --git a/OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs b/OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs index a970755..5f2534b 100644 --- a/OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs +++ b/OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs | |||
@@ -41,7 +41,7 @@ using Mono.Addins; | |||
41 | using OpenSim.Framework; | 41 | using OpenSim.Framework; |
42 | using OpenSim.Region.Framework.Interfaces; | 42 | using OpenSim.Region.Framework.Interfaces; |
43 | using OpenSim.Region.Framework.Scenes; | 43 | using OpenSim.Region.Framework.Scenes; |
44 | using OpenSim.Region.PhysicsModule.SharedBase; | 44 | using OpenSim.Region.PhysicsModules.SharedBase; |
45 | using OpenSim.Services.Interfaces; | 45 | using OpenSim.Services.Interfaces; |
46 | 46 | ||
47 | using OpenMetaverse; | 47 | using OpenMetaverse; |
diff --git a/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs b/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs index b6f2d3d..6d51029 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.PhysicsModule.SharedBase; | 38 | using OpenSim.Region.PhysicsModules.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/KeyframeMotion.cs b/OpenSim/Region/Framework/Scenes/KeyframeMotion.cs index 103386c..bbf3b51 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.PhysicsModule.SharedBase; | 39 | using OpenSim.Region.PhysicsModules.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 2ca2465..ae85560 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.PhysicsModule.SharedBase; | 34 | using OpenSim.Region.PhysicsModules.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 86a5772..09a0a6b 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.PhysicsModule.SharedBase; | 50 | using OpenSim.Region.PhysicsModules.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 9648810..eea0fff 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.PhysicsModule.SharedBase; | 37 | using OpenSim.Region.PhysicsModules.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 3be6ad2..1c4b77a 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.PhysicsModule.SharedBase; | 41 | using OpenSim.Region.PhysicsModules.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 dae8c54..25aa83f 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.PhysicsModule.SharedBase; | 45 | using OpenSim.Region.PhysicsModules.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 d8c6c94..1fddd91 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.PhysicsModule.SharedBase; | 44 | using OpenSim.Region.PhysicsModules.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 53815f0..3c03130 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.PhysicsModule.SharedBase; | 37 | using OpenSim.Region.PhysicsModules.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 5f87f4a..700ca8c 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.PhysicsModule.SharedBase; | 44 | using OpenSim.Region.PhysicsModules.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 |
diff --git a/OpenSim/Region/OptionalModules/PhysicsParameters/PhysicsParameters.cs b/OpenSim/Region/OptionalModules/PhysicsParameters/PhysicsParameters.cs index 1c039cb..1d9179c 100755 --- a/OpenSim/Region/OptionalModules/PhysicsParameters/PhysicsParameters.cs +++ b/OpenSim/Region/OptionalModules/PhysicsParameters/PhysicsParameters.cs | |||
@@ -36,7 +36,7 @@ using OpenSim.Framework.Console; | |||
36 | using OpenSim.Region.CoreModules.Framework.InterfaceCommander; | 36 | using OpenSim.Region.CoreModules.Framework.InterfaceCommander; |
37 | using OpenSim.Region.Framework.Interfaces; | 37 | using OpenSim.Region.Framework.Interfaces; |
38 | using OpenSim.Region.Framework.Scenes; | 38 | using OpenSim.Region.Framework.Scenes; |
39 | using OpenSim.Region.PhysicsModule.SharedBase; | 39 | using OpenSim.Region.PhysicsModules.SharedBase; |
40 | 40 | ||
41 | namespace OpenSim.Region.OptionalModules.PhysicsParameters | 41 | namespace OpenSim.Region.OptionalModules.PhysicsParameters |
42 | { | 42 | { |
diff --git a/OpenSim/Region/OptionalModules/Scripting/ExtendedPhysics/ExtendedPhysics.cs b/OpenSim/Region/OptionalModules/Scripting/ExtendedPhysics/ExtendedPhysics.cs index c5753b9..ab363e5 100755 --- a/OpenSim/Region/OptionalModules/Scripting/ExtendedPhysics/ExtendedPhysics.cs +++ b/OpenSim/Region/OptionalModules/Scripting/ExtendedPhysics/ExtendedPhysics.cs | |||
@@ -36,7 +36,7 @@ using OpenSim.Region.CoreModules; | |||
36 | using OpenSim.Region.Framework; | 36 | using OpenSim.Region.Framework; |
37 | using OpenSim.Region.Framework.Interfaces; | 37 | using OpenSim.Region.Framework.Interfaces; |
38 | using OpenSim.Region.Framework.Scenes; | 38 | using OpenSim.Region.Framework.Scenes; |
39 | using OpenSim.Region.PhysicsModule.SharedBase; | 39 | using OpenSim.Region.PhysicsModules.SharedBase; |
40 | 40 | ||
41 | using Mono.Addins; | 41 | using Mono.Addins; |
42 | using Nini.Config; | 42 | using Nini.Config; |
diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/SOPObject.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/SOPObject.cs index 7922db6..47b9c09 100644 --- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/SOPObject.cs +++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/SOPObject.cs | |||
@@ -34,7 +34,7 @@ using OpenSim.Framework; | |||
34 | using OpenSim.Region.Framework.Interfaces; | 34 | using OpenSim.Region.Framework.Interfaces; |
35 | using OpenSim.Region.Framework.Scenes; | 35 | using OpenSim.Region.Framework.Scenes; |
36 | using OpenSim.Region.OptionalModules.Scripting.Minimodule.Object; | 36 | using OpenSim.Region.OptionalModules.Scripting.Minimodule.Object; |
37 | using OpenSim.Region.PhysicsModule.SharedBase; | 37 | using OpenSim.Region.PhysicsModules.SharedBase; |
38 | using PrimType=OpenSim.Region.OptionalModules.Scripting.Minimodule.Object.PrimType; | 38 | using PrimType=OpenSim.Region.OptionalModules.Scripting.Minimodule.Object.PrimType; |
39 | using SculptType=OpenSim.Region.OptionalModules.Scripting.Minimodule.Object.SculptType; | 39 | using SculptType=OpenSim.Region.OptionalModules.Scripting.Minimodule.Object.SculptType; |
40 | 40 | ||
diff --git a/OpenSim/Region/PhysicsModules/BasicPhysics/BasicPhysicsActor.cs b/OpenSim/Region/PhysicsModules/BasicPhysics/BasicPhysicsActor.cs index 43fba7b..e7b30ba 100644 --- a/OpenSim/Region/PhysicsModules/BasicPhysics/BasicPhysicsActor.cs +++ b/OpenSim/Region/PhysicsModules/BasicPhysics/BasicPhysicsActor.cs | |||
@@ -30,9 +30,9 @@ using System.Collections.Generic; | |||
30 | using Nini.Config; | 30 | using Nini.Config; |
31 | using OpenMetaverse; | 31 | using OpenMetaverse; |
32 | using OpenSim.Framework; | 32 | using OpenSim.Framework; |
33 | using OpenSim.Region.Physics.Manager; | 33 | using OpenSim.Region.PhysicsModules.SharedBase; |
34 | 34 | ||
35 | namespace OpenSim.Region.Physics.BasicPhysicsPlugin | 35 | namespace OpenSim.Region.PhysicsModule.BasicPhysics |
36 | { | 36 | { |
37 | public class BasicActor : PhysicsActor | 37 | public class BasicActor : PhysicsActor |
38 | { | 38 | { |
diff --git a/OpenSim/Region/PhysicsModules/BasicPhysics/BasicPhysicsPlugin.cs b/OpenSim/Region/PhysicsModules/BasicPhysics/BasicPhysicsPlugin.cs index 373c7e0..e78c191 100644 --- a/OpenSim/Region/PhysicsModules/BasicPhysics/BasicPhysicsPlugin.cs +++ b/OpenSim/Region/PhysicsModules/BasicPhysics/BasicPhysicsPlugin.cs | |||
@@ -29,9 +29,9 @@ using System; | |||
29 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
30 | using Nini.Config; | 30 | using Nini.Config; |
31 | using OpenSim.Framework; | 31 | using OpenSim.Framework; |
32 | using OpenSim.Region.Physics.Manager; | 32 | using OpenSim.Region.PhysicsModules.SharedBase; |
33 | 33 | ||
34 | namespace OpenSim.Region.Physics.BasicPhysicsPlugin | 34 | namespace OpenSim.Region.PhysicsModule.BasicPhysics |
35 | { | 35 | { |
36 | /// <summary> | 36 | /// <summary> |
37 | /// Effectively a physics plugin that simulates no physics at all. | 37 | /// Effectively a physics plugin that simulates no physics at all. |
diff --git a/OpenSim/Region/PhysicsModules/BasicPhysics/BasicPhysicsPrim.cs b/OpenSim/Region/PhysicsModules/BasicPhysics/BasicPhysicsPrim.cs index dfe4c19..5383f1b 100644 --- a/OpenSim/Region/PhysicsModules/BasicPhysics/BasicPhysicsPrim.cs +++ b/OpenSim/Region/PhysicsModules/BasicPhysics/BasicPhysicsPrim.cs | |||
@@ -30,9 +30,9 @@ using System.Collections.Generic; | |||
30 | using Nini.Config; | 30 | using Nini.Config; |
31 | using OpenMetaverse; | 31 | using OpenMetaverse; |
32 | using OpenSim.Framework; | 32 | using OpenSim.Framework; |
33 | using OpenSim.Region.Physics.Manager; | 33 | using OpenSim.Region.PhysicsModules.SharedBase; |
34 | 34 | ||
35 | namespace OpenSim.Region.Physics.BasicPhysicsPlugin | 35 | namespace OpenSim.Region.PhysicsModule.BasicPhysics |
36 | { | 36 | { |
37 | public class BasicPhysicsPrim : PhysicsActor | 37 | public class BasicPhysicsPrim : PhysicsActor |
38 | { | 38 | { |
diff --git a/OpenSim/Region/PhysicsModules/BasicPhysics/BasicPhysicsScene.cs b/OpenSim/Region/PhysicsModules/BasicPhysics/BasicPhysicsScene.cs index 06a205e..8b9e65a 100644 --- a/OpenSim/Region/PhysicsModules/BasicPhysics/BasicPhysicsScene.cs +++ b/OpenSim/Region/PhysicsModules/BasicPhysics/BasicPhysicsScene.cs | |||
@@ -30,9 +30,9 @@ using System.Collections.Generic; | |||
30 | using Nini.Config; | 30 | using Nini.Config; |
31 | using OpenMetaverse; | 31 | using OpenMetaverse; |
32 | using OpenSim.Framework; | 32 | using OpenSim.Framework; |
33 | using OpenSim.Region.Physics.Manager; | 33 | using OpenSim.Region.PhysicsModules.SharedBase; |
34 | 34 | ||
35 | namespace OpenSim.Region.Physics.BasicPhysicsPlugin | 35 | namespace OpenSim.Region.PhysicsModule.BasicPhysics |
36 | { | 36 | { |
37 | /// <summary> | 37 | /// <summary> |
38 | /// This is an incomplete extremely basic physics implementation | 38 | /// This is an incomplete extremely basic physics implementation |
diff --git a/OpenSim/Region/PhysicsModules/BulletS/BSActorAvatarMove.cs b/OpenSim/Region/PhysicsModules/BulletS/BSActorAvatarMove.cs index f1a06cc..0191893 100755 --- a/OpenSim/Region/PhysicsModules/BulletS/BSActorAvatarMove.cs +++ b/OpenSim/Region/PhysicsModules/BulletS/BSActorAvatarMove.cs | |||
@@ -31,7 +31,7 @@ using System.Linq; | |||
31 | using System.Text; | 31 | using System.Text; |
32 | 32 | ||
33 | using OpenSim.Framework; | 33 | using OpenSim.Framework; |
34 | using OpenSim.Region.PhysicsModule.SharedBase; | 34 | using OpenSim.Region.PhysicsModules.SharedBase; |
35 | 35 | ||
36 | using OMV = OpenMetaverse; | 36 | using OMV = OpenMetaverse; |
37 | 37 | ||
diff --git a/OpenSim/Region/PhysicsModules/BulletS/BSActorHover.cs b/OpenSim/Region/PhysicsModules/BulletS/BSActorHover.cs index 7fbe920..7ff171e 100755 --- a/OpenSim/Region/PhysicsModules/BulletS/BSActorHover.cs +++ b/OpenSim/Region/PhysicsModules/BulletS/BSActorHover.cs | |||
@@ -30,7 +30,7 @@ using System.Collections.Generic; | |||
30 | using System.Linq; | 30 | using System.Linq; |
31 | using System.Text; | 31 | using System.Text; |
32 | 32 | ||
33 | using OpenSim.Region.PhysicsModule.SharedBase; | 33 | using OpenSim.Region.PhysicsModules.SharedBase; |
34 | 34 | ||
35 | using OMV = OpenMetaverse; | 35 | using OMV = OpenMetaverse; |
36 | 36 | ||
diff --git a/OpenSim/Region/PhysicsModules/BulletS/BSActorMoveToTarget.cs b/OpenSim/Region/PhysicsModules/BulletS/BSActorMoveToTarget.cs index 6a886b0..3db8f2c 100755 --- a/OpenSim/Region/PhysicsModules/BulletS/BSActorMoveToTarget.cs +++ b/OpenSim/Region/PhysicsModules/BulletS/BSActorMoveToTarget.cs | |||
@@ -30,7 +30,7 @@ using System.Collections.Generic; | |||
30 | using System.Linq; | 30 | using System.Linq; |
31 | using System.Text; | 31 | using System.Text; |
32 | 32 | ||
33 | using OpenSim.Region.PhysicsModule.SharedBase; | 33 | using OpenSim.Region.PhysicsModules.SharedBase; |
34 | 34 | ||
35 | using OMV = OpenMetaverse; | 35 | using OMV = OpenMetaverse; |
36 | 36 | ||
diff --git a/OpenSim/Region/PhysicsModules/BulletS/BSActorSetForce.cs b/OpenSim/Region/PhysicsModules/BulletS/BSActorSetForce.cs index e81452a..ecb4b7f 100755 --- a/OpenSim/Region/PhysicsModules/BulletS/BSActorSetForce.cs +++ b/OpenSim/Region/PhysicsModules/BulletS/BSActorSetForce.cs | |||
@@ -30,7 +30,7 @@ using System.Collections.Generic; | |||
30 | using System.Linq; | 30 | using System.Linq; |
31 | using System.Text; | 31 | using System.Text; |
32 | 32 | ||
33 | using OpenSim.Region.PhysicsModule.SharedBase; | 33 | using OpenSim.Region.PhysicsModules.SharedBase; |
34 | 34 | ||
35 | using OMV = OpenMetaverse; | 35 | using OMV = OpenMetaverse; |
36 | 36 | ||
diff --git a/OpenSim/Region/PhysicsModules/BulletS/BSActorSetTorque.cs b/OpenSim/Region/PhysicsModules/BulletS/BSActorSetTorque.cs index 7eeb533..a1cf4db 100755 --- a/OpenSim/Region/PhysicsModules/BulletS/BSActorSetTorque.cs +++ b/OpenSim/Region/PhysicsModules/BulletS/BSActorSetTorque.cs | |||
@@ -30,7 +30,7 @@ using System.Collections.Generic; | |||
30 | using System.Linq; | 30 | using System.Linq; |
31 | using System.Text; | 31 | using System.Text; |
32 | 32 | ||
33 | using OpenSim.Region.PhysicsModule.SharedBase; | 33 | using OpenSim.Region.PhysicsModules.SharedBase; |
34 | 34 | ||
35 | using OMV = OpenMetaverse; | 35 | using OMV = OpenMetaverse; |
36 | 36 | ||
diff --git a/OpenSim/Region/PhysicsModules/BulletS/BSCharacter.cs b/OpenSim/Region/PhysicsModules/BulletS/BSCharacter.cs index d6b8551..83fc3a6 100644 --- a/OpenSim/Region/PhysicsModules/BulletS/BSCharacter.cs +++ b/OpenSim/Region/PhysicsModules/BulletS/BSCharacter.cs | |||
@@ -30,7 +30,7 @@ using System.Reflection; | |||
30 | using log4net; | 30 | using log4net; |
31 | using OMV = OpenMetaverse; | 31 | using OMV = OpenMetaverse; |
32 | using OpenSim.Framework; | 32 | using OpenSim.Framework; |
33 | using OpenSim.Region.PhysicsModule.SharedBase; | 33 | using OpenSim.Region.PhysicsModules.SharedBase; |
34 | 34 | ||
35 | namespace OpenSim.Region.PhysicsModule.BulletS | 35 | namespace OpenSim.Region.PhysicsModule.BulletS |
36 | { | 36 | { |
diff --git a/OpenSim/Region/PhysicsModules/BulletS/BSDynamics.cs b/OpenSim/Region/PhysicsModules/BulletS/BSDynamics.cs index fcf0dd5..0fc5577 100644 --- a/OpenSim/Region/PhysicsModules/BulletS/BSDynamics.cs +++ b/OpenSim/Region/PhysicsModules/BulletS/BSDynamics.cs | |||
@@ -36,7 +36,7 @@ using System.Reflection; | |||
36 | using System.Runtime.InteropServices; | 36 | using System.Runtime.InteropServices; |
37 | using OpenMetaverse; | 37 | using OpenMetaverse; |
38 | using OpenSim.Framework; | 38 | using OpenSim.Framework; |
39 | using OpenSim.Region.PhysicsModule.SharedBase; | 39 | using OpenSim.Region.PhysicsModules.SharedBase; |
40 | 40 | ||
41 | namespace OpenSim.Region.PhysicsModule.BulletS | 41 | namespace OpenSim.Region.PhysicsModule.BulletS |
42 | { | 42 | { |
diff --git a/OpenSim/Region/PhysicsModules/BulletS/BSParam.cs b/OpenSim/Region/PhysicsModules/BulletS/BSParam.cs index 10bbfb3..c296008 100755 --- a/OpenSim/Region/PhysicsModules/BulletS/BSParam.cs +++ b/OpenSim/Region/PhysicsModules/BulletS/BSParam.cs | |||
@@ -29,7 +29,7 @@ using System.Collections.Generic; | |||
29 | using System.Reflection; | 29 | using System.Reflection; |
30 | using System.Text; | 30 | using System.Text; |
31 | 31 | ||
32 | using OpenSim.Region.PhysicsModule.SharedBase; | 32 | using OpenSim.Region.PhysicsModules.SharedBase; |
33 | 33 | ||
34 | using OpenMetaverse; | 34 | using OpenMetaverse; |
35 | using Nini.Config; | 35 | using Nini.Config; |
diff --git a/OpenSim/Region/PhysicsModules/BulletS/BSPhysObject.cs b/OpenSim/Region/PhysicsModules/BulletS/BSPhysObject.cs index 4d69f61..da3fc18 100755 --- a/OpenSim/Region/PhysicsModules/BulletS/BSPhysObject.cs +++ b/OpenSim/Region/PhysicsModules/BulletS/BSPhysObject.cs | |||
@@ -30,7 +30,7 @@ using System.Text; | |||
30 | 30 | ||
31 | using OMV = OpenMetaverse; | 31 | using OMV = OpenMetaverse; |
32 | using OpenSim.Framework; | 32 | using OpenSim.Framework; |
33 | using OpenSim.Region.PhysicsModule.SharedBase; | 33 | using OpenSim.Region.PhysicsModules.SharedBase; |
34 | 34 | ||
35 | namespace OpenSim.Region.PhysicsModule.BulletS | 35 | namespace OpenSim.Region.PhysicsModule.BulletS |
36 | { | 36 | { |
diff --git a/OpenSim/Region/PhysicsModules/BulletS/BSPlugin.cs b/OpenSim/Region/PhysicsModules/BulletS/BSPlugin.cs index e28cd92..f7954d8 100644 --- a/OpenSim/Region/PhysicsModules/BulletS/BSPlugin.cs +++ b/OpenSim/Region/PhysicsModules/BulletS/BSPlugin.cs | |||
@@ -27,7 +27,7 @@ | |||
27 | using System; | 27 | using System; |
28 | using System.Collections.Generic; | 28 | using System.Collections.Generic; |
29 | using OpenSim.Framework; | 29 | using OpenSim.Framework; |
30 | using OpenSim.Region.PhysicsModule.SharedBase; | 30 | using OpenSim.Region.PhysicsModules.SharedBase; |
31 | using OpenMetaverse; | 31 | using OpenMetaverse; |
32 | 32 | ||
33 | namespace OpenSim.Region.PhysicsModule.BulletS | 33 | namespace OpenSim.Region.PhysicsModule.BulletS |
diff --git a/OpenSim/Region/PhysicsModules/BulletS/BSPrim.cs b/OpenSim/Region/PhysicsModules/BulletS/BSPrim.cs index ab6aa5d..3e74428 100644 --- a/OpenSim/Region/PhysicsModules/BulletS/BSPrim.cs +++ b/OpenSim/Region/PhysicsModules/BulletS/BSPrim.cs | |||
@@ -32,7 +32,7 @@ using System.Xml; | |||
32 | using log4net; | 32 | using log4net; |
33 | using OMV = OpenMetaverse; | 33 | using OMV = OpenMetaverse; |
34 | using OpenSim.Framework; | 34 | using OpenSim.Framework; |
35 | using OpenSim.Region.PhysicsModule.SharedBase; | 35 | using OpenSim.Region.PhysicsModules.SharedBase; |
36 | using OpenSim.Region.PhysicsModule.ConvexDecompositionDotNet; | 36 | using OpenSim.Region.PhysicsModule.ConvexDecompositionDotNet; |
37 | using OpenSim.Region.OptionalModules.Scripting; // for ExtendedPhysics | 37 | using OpenSim.Region.OptionalModules.Scripting; // for ExtendedPhysics |
38 | 38 | ||
diff --git a/OpenSim/Region/PhysicsModules/BulletS/BSPrimDisplaced.cs b/OpenSim/Region/PhysicsModules/BulletS/BSPrimDisplaced.cs index 6b234af..d8ed56b 100755 --- a/OpenSim/Region/PhysicsModules/BulletS/BSPrimDisplaced.cs +++ b/OpenSim/Region/PhysicsModules/BulletS/BSPrimDisplaced.cs | |||
@@ -31,7 +31,7 @@ using System.Reflection; | |||
31 | using System.Runtime.InteropServices; | 31 | using System.Runtime.InteropServices; |
32 | using OpenMetaverse; | 32 | using OpenMetaverse; |
33 | using OpenSim.Framework; | 33 | using OpenSim.Framework; |
34 | using OpenSim.Region.PhysicsModule.SharedBase; | 34 | using OpenSim.Region.PhysicsModules.SharedBase; |
35 | 35 | ||
36 | using OMV = OpenMetaverse; | 36 | using OMV = OpenMetaverse; |
37 | 37 | ||
diff --git a/OpenSim/Region/PhysicsModules/BulletS/BSPrimLinkable.cs b/OpenSim/Region/PhysicsModules/BulletS/BSPrimLinkable.cs index 91550cb..8f494cc 100755 --- a/OpenSim/Region/PhysicsModules/BulletS/BSPrimLinkable.cs +++ b/OpenSim/Region/PhysicsModules/BulletS/BSPrimLinkable.cs | |||
@@ -72,7 +72,7 @@ public class BSPrimLinkable : BSPrimDisplaced | |||
72 | base.Destroy(); | 72 | base.Destroy(); |
73 | } | 73 | } |
74 | 74 | ||
75 | public override void link(SharedBase.PhysicsActor obj) | 75 | public override void link(OpenSim.Region.PhysicsModules.SharedBase.PhysicsActor obj) |
76 | { | 76 | { |
77 | BSPrimLinkable parent = obj as BSPrimLinkable; | 77 | BSPrimLinkable parent = obj as BSPrimLinkable; |
78 | if (parent != null) | 78 | if (parent != null) |
diff --git a/OpenSim/Region/PhysicsModules/BulletS/BSScene.cs b/OpenSim/Region/PhysicsModules/BulletS/BSScene.cs index 18a4a58..80f98ef 100644 --- a/OpenSim/Region/PhysicsModules/BulletS/BSScene.cs +++ b/OpenSim/Region/PhysicsModules/BulletS/BSScene.cs | |||
@@ -36,7 +36,7 @@ using OpenSim.Framework.Monitoring; | |||
36 | using OpenSim.Region.Framework; | 36 | using OpenSim.Region.Framework; |
37 | using OpenSim.Region.CoreModules; | 37 | using OpenSim.Region.CoreModules; |
38 | using Logging = OpenSim.Region.CoreModules.Framework.Statistics.Logging; | 38 | using Logging = OpenSim.Region.CoreModules.Framework.Statistics.Logging; |
39 | using OpenSim.Region.PhysicsModule.SharedBase; | 39 | using OpenSim.Region.PhysicsModules.SharedBase; |
40 | using Nini.Config; | 40 | using Nini.Config; |
41 | using log4net; | 41 | using log4net; |
42 | using OpenMetaverse; | 42 | using OpenMetaverse; |
diff --git a/OpenSim/Region/PhysicsModules/BulletS/BSShapeCollection.cs b/OpenSim/Region/PhysicsModules/BulletS/BSShapeCollection.cs index 8dba3e4..b100273 100755 --- a/OpenSim/Region/PhysicsModules/BulletS/BSShapeCollection.cs +++ b/OpenSim/Region/PhysicsModules/BulletS/BSShapeCollection.cs | |||
@@ -29,7 +29,7 @@ using System.Collections.Generic; | |||
29 | using System.Text; | 29 | using System.Text; |
30 | using OMV = OpenMetaverse; | 30 | using OMV = OpenMetaverse; |
31 | using OpenSim.Framework; | 31 | using OpenSim.Framework; |
32 | using OpenSim.Region.PhysicsModule.SharedBase; | 32 | using OpenSim.Region.PhysicsModules.SharedBase; |
33 | using OpenSim.Region.PhysicsModule.ConvexDecompositionDotNet; | 33 | using OpenSim.Region.PhysicsModule.ConvexDecompositionDotNet; |
34 | 34 | ||
35 | namespace OpenSim.Region.PhysicsModule.BulletS | 35 | namespace OpenSim.Region.PhysicsModule.BulletS |
diff --git a/OpenSim/Region/PhysicsModules/BulletS/BSShapes.cs b/OpenSim/Region/PhysicsModules/BulletS/BSShapes.cs index d8189e0..7357962 100755 --- a/OpenSim/Region/PhysicsModules/BulletS/BSShapes.cs +++ b/OpenSim/Region/PhysicsModules/BulletS/BSShapes.cs | |||
@@ -30,7 +30,7 @@ using System.Collections.Generic; | |||
30 | using System.Text; | 30 | using System.Text; |
31 | 31 | ||
32 | using OpenSim.Framework; | 32 | using OpenSim.Framework; |
33 | using OpenSim.Region.PhysicsModule.SharedBase; | 33 | using OpenSim.Region.PhysicsModules.SharedBase; |
34 | using OpenSim.Region.PhysicsModule.Meshing; | 34 | using OpenSim.Region.PhysicsModule.Meshing; |
35 | using OpenSim.Region.PhysicsModule.ConvexDecompositionDotNet; | 35 | using OpenSim.Region.PhysicsModule.ConvexDecompositionDotNet; |
36 | 36 | ||
diff --git a/OpenSim/Region/PhysicsModules/BulletS/BSTerrainHeightmap.cs b/OpenSim/Region/PhysicsModules/BulletS/BSTerrainHeightmap.cs index 7704d1f..e560796 100755 --- a/OpenSim/Region/PhysicsModules/BulletS/BSTerrainHeightmap.cs +++ b/OpenSim/Region/PhysicsModules/BulletS/BSTerrainHeightmap.cs | |||
@@ -31,7 +31,7 @@ using System.Text; | |||
31 | using OpenSim.Framework; | 31 | using OpenSim.Framework; |
32 | using OpenSim.Region.Framework; | 32 | using OpenSim.Region.Framework; |
33 | using OpenSim.Region.CoreModules; | 33 | using OpenSim.Region.CoreModules; |
34 | using OpenSim.Region.PhysicsModule.SharedBase; | 34 | using OpenSim.Region.PhysicsModules.SharedBase; |
35 | 35 | ||
36 | using Nini.Config; | 36 | using Nini.Config; |
37 | using log4net; | 37 | using log4net; |
diff --git a/OpenSim/Region/PhysicsModules/BulletS/BSTerrainManager.cs b/OpenSim/Region/PhysicsModules/BulletS/BSTerrainManager.cs index 6e686ce..bd84fce 100755 --- a/OpenSim/Region/PhysicsModules/BulletS/BSTerrainManager.cs +++ b/OpenSim/Region/PhysicsModules/BulletS/BSTerrainManager.cs | |||
@@ -31,7 +31,7 @@ using System.Text; | |||
31 | using OpenSim.Framework; | 31 | using OpenSim.Framework; |
32 | using OpenSim.Region.Framework; | 32 | using OpenSim.Region.Framework; |
33 | using OpenSim.Region.CoreModules; | 33 | using OpenSim.Region.CoreModules; |
34 | using OpenSim.Region.PhysicsModule.SharedBase; | 34 | using OpenSim.Region.PhysicsModules.SharedBase; |
35 | 35 | ||
36 | using Nini.Config; | 36 | using Nini.Config; |
37 | using log4net; | 37 | using log4net; |
diff --git a/OpenSim/Region/PhysicsModules/BulletS/BSTerrainMesh.cs b/OpenSim/Region/PhysicsModules/BulletS/BSTerrainMesh.cs index 4c3e33a..ae96491 100755 --- a/OpenSim/Region/PhysicsModules/BulletS/BSTerrainMesh.cs +++ b/OpenSim/Region/PhysicsModules/BulletS/BSTerrainMesh.cs | |||
@@ -31,7 +31,7 @@ using System.Text; | |||
31 | using OpenSim.Framework; | 31 | using OpenSim.Framework; |
32 | using OpenSim.Region.Framework; | 32 | using OpenSim.Region.Framework; |
33 | using OpenSim.Region.CoreModules; | 33 | using OpenSim.Region.CoreModules; |
34 | using OpenSim.Region.PhysicsModule.SharedBase; | 34 | using OpenSim.Region.PhysicsModules.SharedBase; |
35 | 35 | ||
36 | using Nini.Config; | 36 | using Nini.Config; |
37 | using log4net; | 37 | using log4net; |
diff --git a/OpenSim/Region/PhysicsModules/BulletS/Tests/BasicVehicles.cs b/OpenSim/Region/PhysicsModules/BulletS/Tests/BasicVehicles.cs index 160ebb5..35eba29 100755 --- a/OpenSim/Region/PhysicsModules/BulletS/Tests/BasicVehicles.cs +++ b/OpenSim/Region/PhysicsModules/BulletS/Tests/BasicVehicles.cs | |||
@@ -35,7 +35,7 @@ using log4net; | |||
35 | 35 | ||
36 | using OpenSim.Framework; | 36 | using OpenSim.Framework; |
37 | using OpenSim.Region.PhysicsModule.BulletS; | 37 | using OpenSim.Region.PhysicsModule.BulletS; |
38 | using OpenSim.Region.PhysicsModule.SharedBase; | 38 | using OpenSim.Region.PhysicsModules.SharedBase; |
39 | using OpenSim.Tests.Common; | 39 | using OpenSim.Tests.Common; |
40 | 40 | ||
41 | using OpenMetaverse; | 41 | using OpenMetaverse; |
diff --git a/OpenSim/Region/PhysicsModules/BulletS/Tests/BulletSimTestsUtil.cs b/OpenSim/Region/PhysicsModules/BulletS/Tests/BulletSimTestsUtil.cs index 173e20d..8915e6f 100755 --- a/OpenSim/Region/PhysicsModules/BulletS/Tests/BulletSimTestsUtil.cs +++ b/OpenSim/Region/PhysicsModules/BulletS/Tests/BulletSimTestsUtil.cs | |||
@@ -33,7 +33,7 @@ using System.Text; | |||
33 | using Nini.Config; | 33 | using Nini.Config; |
34 | 34 | ||
35 | using OpenSim.Framework; | 35 | using OpenSim.Framework; |
36 | using OpenSim.Region.PhysicsModule.SharedBase; | 36 | using OpenSim.Region.PhysicsModules.SharedBase; |
37 | using OpenSim.Region.PhysicsModule.Meshing; | 37 | using OpenSim.Region.PhysicsModule.Meshing; |
38 | 38 | ||
39 | using OpenMetaverse; | 39 | using OpenMetaverse; |
diff --git a/OpenSim/Region/PhysicsModules/BulletS/Tests/HullCreation.cs b/OpenSim/Region/PhysicsModules/BulletS/Tests/HullCreation.cs index 69078f2..c0cf19a 100644 --- a/OpenSim/Region/PhysicsModules/BulletS/Tests/HullCreation.cs +++ b/OpenSim/Region/PhysicsModules/BulletS/Tests/HullCreation.cs | |||
@@ -35,7 +35,7 @@ using log4net; | |||
35 | 35 | ||
36 | using OpenSim.Framework; | 36 | using OpenSim.Framework; |
37 | using OpenSim.Region.PhysicsModule.BulletS; | 37 | using OpenSim.Region.PhysicsModule.BulletS; |
38 | using OpenSim.Region.PhysicsModule.SharedBase; | 38 | using OpenSim.Region.PhysicsModules.SharedBase; |
39 | using OpenSim.Tests.Common; | 39 | using OpenSim.Tests.Common; |
40 | 40 | ||
41 | using OpenMetaverse; | 41 | using OpenMetaverse; |
diff --git a/OpenSim/Region/PhysicsModules/Meshing/HelperTypes.cs b/OpenSim/Region/PhysicsModules/Meshing/HelperTypes.cs index 2f857ee..a0e3b7f 100644 --- a/OpenSim/Region/PhysicsModules/Meshing/HelperTypes.cs +++ b/OpenSim/Region/PhysicsModules/Meshing/HelperTypes.cs | |||
@@ -30,7 +30,7 @@ using System.Collections.Generic; | |||
30 | using System.Diagnostics; | 30 | using System.Diagnostics; |
31 | using System.Globalization; | 31 | using System.Globalization; |
32 | using OpenMetaverse; | 32 | using OpenMetaverse; |
33 | using OpenSim.Region.PhysicsModule.SharedBase; | 33 | using OpenSim.Region.PhysicsModules.SharedBase; |
34 | using OpenSim.Region.PhysicsModule.Meshing; | 34 | using OpenSim.Region.PhysicsModule.Meshing; |
35 | 35 | ||
36 | public class Vertex : IComparable<Vertex> | 36 | public class Vertex : IComparable<Vertex> |
diff --git a/OpenSim/Region/PhysicsModules/Meshing/Mesh.cs b/OpenSim/Region/PhysicsModules/Meshing/Mesh.cs index 1a8574e..2ccb976 100644 --- a/OpenSim/Region/PhysicsModules/Meshing/Mesh.cs +++ b/OpenSim/Region/PhysicsModules/Meshing/Mesh.cs | |||
@@ -29,7 +29,7 @@ using System; | |||
29 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
30 | using System.IO; | 30 | using System.IO; |
31 | using System.Runtime.InteropServices; | 31 | using System.Runtime.InteropServices; |
32 | using OpenSim.Region.PhysicsModule.SharedBase; | 32 | using OpenSim.Region.PhysicsModules.SharedBase; |
33 | using PrimMesher; | 33 | using PrimMesher; |
34 | using OpenMetaverse; | 34 | using OpenMetaverse; |
35 | 35 | ||
diff --git a/OpenSim/Region/PhysicsModules/Meshing/Meshmerizer.cs b/OpenSim/Region/PhysicsModules/Meshing/Meshmerizer.cs index c885665..77fdebf 100644 --- a/OpenSim/Region/PhysicsModules/Meshing/Meshmerizer.cs +++ b/OpenSim/Region/PhysicsModules/Meshing/Meshmerizer.cs | |||
@@ -29,7 +29,7 @@ | |||
29 | using System; | 29 | using System; |
30 | using System.Collections.Generic; | 30 | using System.Collections.Generic; |
31 | using OpenSim.Framework; | 31 | using OpenSim.Framework; |
32 | using OpenSim.Region.PhysicsModule.SharedBase; | 32 | using OpenSim.Region.PhysicsModules.SharedBase; |
33 | using OpenMetaverse; | 33 | using OpenMetaverse; |
34 | using OpenMetaverse.StructuredData; | 34 | using OpenMetaverse.StructuredData; |
35 | using System.Drawing; | 35 | using System.Drawing; |
diff --git a/OpenSim/Region/PhysicsModules/Ode/ODECharacter.cs b/OpenSim/Region/PhysicsModules/Ode/ODECharacter.cs index 048ca44..44f4039 100644 --- a/OpenSim/Region/PhysicsModules/Ode/ODECharacter.cs +++ b/OpenSim/Region/PhysicsModules/Ode/ODECharacter.cs | |||
@@ -31,7 +31,7 @@ using System.Reflection; | |||
31 | using OpenMetaverse; | 31 | using OpenMetaverse; |
32 | using Ode.NET; | 32 | using Ode.NET; |
33 | using OpenSim.Framework; | 33 | using OpenSim.Framework; |
34 | using OpenSim.Region.PhysicsModule.SharedBase; | 34 | using OpenSim.Region.PhysicsModules.SharedBase; |
35 | using log4net; | 35 | using log4net; |
36 | 36 | ||
37 | namespace OpenSim.Region.PhysicsModule.ODE | 37 | namespace OpenSim.Region.PhysicsModule.ODE |
diff --git a/OpenSim/Region/PhysicsModules/Ode/ODEDynamics.cs b/OpenSim/Region/PhysicsModules/Ode/ODEDynamics.cs index 0b0c8a9..8f8e2bd 100644 --- a/OpenSim/Region/PhysicsModules/Ode/ODEDynamics.cs +++ b/OpenSim/Region/PhysicsModules/Ode/ODEDynamics.cs | |||
@@ -46,7 +46,7 @@ using log4net; | |||
46 | using OpenMetaverse; | 46 | using OpenMetaverse; |
47 | using Ode.NET; | 47 | using Ode.NET; |
48 | using OpenSim.Framework; | 48 | using OpenSim.Framework; |
49 | using OpenSim.Region.PhysicsModule.SharedBase; | 49 | using OpenSim.Region.PhysicsModules.SharedBase; |
50 | 50 | ||
51 | namespace OpenSim.Region.PhysicsModule.ODE | 51 | namespace OpenSim.Region.PhysicsModule.ODE |
52 | { | 52 | { |
diff --git a/OpenSim/Region/PhysicsModules/Ode/ODEPrim.cs b/OpenSim/Region/PhysicsModules/Ode/ODEPrim.cs index d8849e7..91a4302 100644 --- a/OpenSim/Region/PhysicsModules/Ode/ODEPrim.cs +++ b/OpenSim/Region/PhysicsModules/Ode/ODEPrim.cs | |||
@@ -50,7 +50,7 @@ using log4net; | |||
50 | using OpenMetaverse; | 50 | using OpenMetaverse; |
51 | using Ode.NET; | 51 | using Ode.NET; |
52 | using OpenSim.Framework; | 52 | using OpenSim.Framework; |
53 | using OpenSim.Region.PhysicsModule.SharedBase; | 53 | using OpenSim.Region.PhysicsModules.SharedBase; |
54 | 54 | ||
55 | namespace OpenSim.Region.PhysicsModule.ODE | 55 | namespace OpenSim.Region.PhysicsModule.ODE |
56 | { | 56 | { |
diff --git a/OpenSim/Region/PhysicsModules/Ode/ODERayCastRequestManager.cs b/OpenSim/Region/PhysicsModules/Ode/ODERayCastRequestManager.cs index 2bcdcd4..21bfea3 100644 --- a/OpenSim/Region/PhysicsModules/Ode/ODERayCastRequestManager.cs +++ b/OpenSim/Region/PhysicsModules/Ode/ODERayCastRequestManager.cs | |||
@@ -31,7 +31,7 @@ using System.Reflection; | |||
31 | using System.Runtime.InteropServices; | 31 | using System.Runtime.InteropServices; |
32 | using System.Text; | 32 | using System.Text; |
33 | using OpenMetaverse; | 33 | using OpenMetaverse; |
34 | using OpenSim.Region.PhysicsModule.SharedBase; | 34 | using OpenSim.Region.PhysicsModules.SharedBase; |
35 | using Ode.NET; | 35 | using Ode.NET; |
36 | using log4net; | 36 | using log4net; |
37 | 37 | ||
diff --git a/OpenSim/Region/PhysicsModules/Ode/OdePhysicsJoint.cs b/OpenSim/Region/PhysicsModules/Ode/OdePhysicsJoint.cs index 5180583..2eb7ba6 100644 --- a/OpenSim/Region/PhysicsModules/Ode/OdePhysicsJoint.cs +++ b/OpenSim/Region/PhysicsModules/Ode/OdePhysicsJoint.cs | |||
@@ -29,7 +29,7 @@ using System; | |||
29 | using OpenMetaverse; | 29 | using OpenMetaverse; |
30 | using Ode.NET; | 30 | using Ode.NET; |
31 | using OpenSim.Framework; | 31 | using OpenSim.Framework; |
32 | using OpenSim.Region.PhysicsModule.SharedBase; | 32 | using OpenSim.Region.PhysicsModules.SharedBase; |
33 | using OpenSim.Region.PhysicsModule.ODE; | 33 | using OpenSim.Region.PhysicsModule.ODE; |
34 | 34 | ||
35 | namespace OpenSim.Region.PhysicsModule.ODE | 35 | namespace OpenSim.Region.PhysicsModule.ODE |
diff --git a/OpenSim/Region/PhysicsModules/Ode/OdePlugin.cs b/OpenSim/Region/PhysicsModules/Ode/OdePlugin.cs index c3e01dd..1d9d0e5 100644 --- a/OpenSim/Region/PhysicsModules/Ode/OdePlugin.cs +++ b/OpenSim/Region/PhysicsModules/Ode/OdePlugin.cs | |||
@@ -36,7 +36,7 @@ using log4net; | |||
36 | using Nini.Config; | 36 | using Nini.Config; |
37 | using Ode.NET; | 37 | using Ode.NET; |
38 | using OpenSim.Framework; | 38 | using OpenSim.Framework; |
39 | using OpenSim.Region.PhysicsModule.SharedBase; | 39 | using OpenSim.Region.PhysicsModules.SharedBase; |
40 | using OpenMetaverse; | 40 | using OpenMetaverse; |
41 | 41 | ||
42 | namespace OpenSim.Region.PhysicsModule.ODE | 42 | namespace OpenSim.Region.PhysicsModule.ODE |
diff --git a/OpenSim/Region/PhysicsModules/Ode/OdeScene.cs b/OpenSim/Region/PhysicsModules/Ode/OdeScene.cs index e30036b..d7163e2 100644 --- a/OpenSim/Region/PhysicsModules/Ode/OdeScene.cs +++ b/OpenSim/Region/PhysicsModules/Ode/OdeScene.cs | |||
@@ -44,7 +44,7 @@ using OpenMetaverse; | |||
44 | using Drawstuff.NET; | 44 | using Drawstuff.NET; |
45 | #endif | 45 | #endif |
46 | using OpenSim.Framework; | 46 | using OpenSim.Framework; |
47 | using OpenSim.Region.PhysicsModule.SharedBase; | 47 | using OpenSim.Region.PhysicsModules.SharedBase; |
48 | 48 | ||
49 | namespace OpenSim.Region.PhysicsModule.ODE | 49 | namespace OpenSim.Region.PhysicsModule.ODE |
50 | { | 50 | { |
diff --git a/OpenSim/Region/PhysicsModules/Ode/Tests/ODETestClass.cs b/OpenSim/Region/PhysicsModules/Ode/Tests/ODETestClass.cs index 09147b0..1816656 100644 --- a/OpenSim/Region/PhysicsModules/Ode/Tests/ODETestClass.cs +++ b/OpenSim/Region/PhysicsModules/Ode/Tests/ODETestClass.cs | |||
@@ -30,7 +30,7 @@ using Nini.Config; | |||
30 | using NUnit.Framework; | 30 | using NUnit.Framework; |
31 | using OpenMetaverse; | 31 | using OpenMetaverse; |
32 | using OpenSim.Framework; | 32 | using OpenSim.Framework; |
33 | using OpenSim.Region.PhysicsModule.SharedBase; | 33 | using OpenSim.Region.PhysicsModules.SharedBase; |
34 | using OpenSim.Region.PhysicsModule.ODE; | 34 | using OpenSim.Region.PhysicsModule.ODE; |
35 | using OpenSim.Tests.Common; | 35 | using OpenSim.Tests.Common; |
36 | using log4net; | 36 | using log4net; |
diff --git a/OpenSim/Region/PhysicsModules/POS/POSCharacter.cs b/OpenSim/Region/PhysicsModules/POS/POSCharacter.cs index 1dccbe7..32469d9 100644 --- a/OpenSim/Region/PhysicsModules/POS/POSCharacter.cs +++ b/OpenSim/Region/PhysicsModules/POS/POSCharacter.cs | |||
@@ -30,7 +30,7 @@ using System.Collections.Generic; | |||
30 | using Nini.Config; | 30 | using Nini.Config; |
31 | using OpenMetaverse; | 31 | using OpenMetaverse; |
32 | using OpenSim.Framework; | 32 | using OpenSim.Framework; |
33 | using OpenSim.Region.PhysicsModule.SharedBase; | 33 | using OpenSim.Region.PhysicsModules.SharedBase; |
34 | 34 | ||
35 | namespace OpenSim.Region.PhysicsModule.POS | 35 | namespace OpenSim.Region.PhysicsModule.POS |
36 | { | 36 | { |
diff --git a/OpenSim/Region/PhysicsModules/POS/POSPlugin.cs b/OpenSim/Region/PhysicsModules/POS/POSPlugin.cs index 4bf58c1..3fe1a0a 100644 --- a/OpenSim/Region/PhysicsModules/POS/POSPlugin.cs +++ b/OpenSim/Region/PhysicsModules/POS/POSPlugin.cs | |||
@@ -29,7 +29,7 @@ using System; | |||
29 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
30 | using Nini.Config; | 30 | using Nini.Config; |
31 | using OpenSim.Framework; | 31 | using OpenSim.Framework; |
32 | using OpenSim.Region.PhysicsModule.SharedBase; | 32 | using OpenSim.Region.PhysicsModules.SharedBase; |
33 | 33 | ||
34 | namespace OpenSim.Region.PhysicsModule.POS | 34 | namespace OpenSim.Region.PhysicsModule.POS |
35 | { | 35 | { |
diff --git a/OpenSim/Region/PhysicsModules/POS/POSPrim.cs b/OpenSim/Region/PhysicsModules/POS/POSPrim.cs index 88a9502..8aae716 100644 --- a/OpenSim/Region/PhysicsModules/POS/POSPrim.cs +++ b/OpenSim/Region/PhysicsModules/POS/POSPrim.cs | |||
@@ -30,7 +30,7 @@ using System.Collections.Generic; | |||
30 | using Nini.Config; | 30 | using Nini.Config; |
31 | using OpenMetaverse; | 31 | using OpenMetaverse; |
32 | using OpenSim.Framework; | 32 | using OpenSim.Framework; |
33 | using OpenSim.Region.PhysicsModule.SharedBase; | 33 | using OpenSim.Region.PhysicsModules.SharedBase; |
34 | 34 | ||
35 | namespace OpenSim.Region.PhysicsModule.POS | 35 | namespace OpenSim.Region.PhysicsModule.POS |
36 | { | 36 | { |
diff --git a/OpenSim/Region/PhysicsModules/POS/POSScene.cs b/OpenSim/Region/PhysicsModules/POS/POSScene.cs index 8c3d5f5..603502f 100644 --- a/OpenSim/Region/PhysicsModules/POS/POSScene.cs +++ b/OpenSim/Region/PhysicsModules/POS/POSScene.cs | |||
@@ -30,7 +30,7 @@ using System.Collections.Generic; | |||
30 | using Nini.Config; | 30 | using Nini.Config; |
31 | using OpenMetaverse; | 31 | using OpenMetaverse; |
32 | using OpenSim.Framework; | 32 | using OpenSim.Framework; |
33 | using OpenSim.Region.PhysicsModule.SharedBase; | 33 | using OpenSim.Region.PhysicsModules.SharedBase; |
34 | 34 | ||
35 | namespace OpenSim.Region.PhysicsModule.POS | 35 | namespace OpenSim.Region.PhysicsModule.POS |
36 | { | 36 | { |
diff --git a/OpenSim/Region/PhysicsModules/SharedBase/CollisionLocker.cs b/OpenSim/Region/PhysicsModules/SharedBase/CollisionLocker.cs index 687c4ca..6e658b5 100644 --- a/OpenSim/Region/PhysicsModules/SharedBase/CollisionLocker.cs +++ b/OpenSim/Region/PhysicsModules/SharedBase/CollisionLocker.cs | |||
@@ -28,7 +28,7 @@ | |||
28 | using System; | 28 | using System; |
29 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
30 | 30 | ||
31 | namespace OpenSim.Region.PhysicsModule.SharedBase | 31 | namespace OpenSim.Region.PhysicsModules.SharedBase |
32 | { | 32 | { |
33 | public class CollisionLocker | 33 | public class CollisionLocker |
34 | { | 34 | { |
diff --git a/OpenSim/Region/PhysicsModules/SharedBase/IMesher.cs b/OpenSim/Region/PhysicsModules/SharedBase/IMesher.cs index e6cb76e..5c75307 100644 --- a/OpenSim/Region/PhysicsModules/SharedBase/IMesher.cs +++ b/OpenSim/Region/PhysicsModules/SharedBase/IMesher.cs | |||
@@ -30,7 +30,7 @@ using System.Collections.Generic; | |||
30 | using OpenSim.Framework; | 30 | using OpenSim.Framework; |
31 | using OpenMetaverse; | 31 | using OpenMetaverse; |
32 | 32 | ||
33 | namespace OpenSim.Region.PhysicsModule.SharedBase | 33 | namespace OpenSim.Region.PhysicsModules.SharedBase |
34 | { | 34 | { |
35 | public interface IMesher | 35 | public interface IMesher |
36 | { | 36 | { |
diff --git a/OpenSim/Region/PhysicsModules/SharedBase/IPhysicsParameters.cs b/OpenSim/Region/PhysicsModules/SharedBase/IPhysicsParameters.cs index da0054a..fb0c9e2 100755 --- a/OpenSim/Region/PhysicsModules/SharedBase/IPhysicsParameters.cs +++ b/OpenSim/Region/PhysicsModules/SharedBase/IPhysicsParameters.cs | |||
@@ -30,7 +30,7 @@ using System.Collections.Generic; | |||
30 | using OpenSim.Framework; | 30 | using OpenSim.Framework; |
31 | using OpenMetaverse; | 31 | using OpenMetaverse; |
32 | 32 | ||
33 | namespace OpenSim.Region.PhysicsModule.SharedBase | 33 | namespace OpenSim.Region.PhysicsModules.SharedBase |
34 | { | 34 | { |
35 | public struct PhysParameterEntry | 35 | public struct PhysParameterEntry |
36 | { | 36 | { |
diff --git a/OpenSim/Region/PhysicsModules/SharedBase/NullPhysicsScene.cs b/OpenSim/Region/PhysicsModules/SharedBase/NullPhysicsScene.cs index d5fc9c6..da896a3 100644 --- a/OpenSim/Region/PhysicsModules/SharedBase/NullPhysicsScene.cs +++ b/OpenSim/Region/PhysicsModules/SharedBase/NullPhysicsScene.cs | |||
@@ -32,7 +32,7 @@ using Nini.Config; | |||
32 | using OpenSim.Framework; | 32 | using OpenSim.Framework; |
33 | using OpenMetaverse; | 33 | using OpenMetaverse; |
34 | 34 | ||
35 | namespace OpenSim.Region.PhysicsModule.SharedBase | 35 | namespace OpenSim.Region.PhysicsModules.SharedBase |
36 | { | 36 | { |
37 | class NullPhysicsScene : PhysicsScene | 37 | class NullPhysicsScene : PhysicsScene |
38 | { | 38 | { |
diff --git a/OpenSim/Region/PhysicsModules/SharedBase/PhysicsActor.cs b/OpenSim/Region/PhysicsModules/SharedBase/PhysicsActor.cs index bfa6254..c04ff58 100644 --- a/OpenSim/Region/PhysicsModules/SharedBase/PhysicsActor.cs +++ b/OpenSim/Region/PhysicsModules/SharedBase/PhysicsActor.cs | |||
@@ -32,7 +32,7 @@ using System.Reflection; | |||
32 | using OpenSim.Framework; | 32 | using OpenSim.Framework; |
33 | using OpenMetaverse; | 33 | using OpenMetaverse; |
34 | 34 | ||
35 | namespace OpenSim.Region.PhysicsModule.SharedBase | 35 | namespace OpenSim.Region.PhysicsModules.SharedBase |
36 | { | 36 | { |
37 | public delegate void PositionUpdate(Vector3 position); | 37 | public delegate void PositionUpdate(Vector3 position); |
38 | public delegate void VelocityUpdate(Vector3 velocity); | 38 | public delegate void VelocityUpdate(Vector3 velocity); |
diff --git a/OpenSim/Region/PhysicsModules/SharedBase/PhysicsJoint.cs b/OpenSim/Region/PhysicsModules/SharedBase/PhysicsJoint.cs index 8fc2638..ce2bf05 100644 --- a/OpenSim/Region/PhysicsModules/SharedBase/PhysicsJoint.cs +++ b/OpenSim/Region/PhysicsModules/SharedBase/PhysicsJoint.cs | |||
@@ -30,7 +30,7 @@ using System.Collections.Generic; | |||
30 | using OpenSim.Framework; | 30 | using OpenSim.Framework; |
31 | using OpenMetaverse; | 31 | using OpenMetaverse; |
32 | 32 | ||
33 | namespace OpenSim.Region.PhysicsModule.SharedBase | 33 | namespace OpenSim.Region.PhysicsModules.SharedBase |
34 | { | 34 | { |
35 | public enum PhysicsJointType : int | 35 | public enum PhysicsJointType : int |
36 | { | 36 | { |
diff --git a/OpenSim/Region/PhysicsModules/SharedBase/PhysicsPluginManager.cs b/OpenSim/Region/PhysicsModules/SharedBase/PhysicsPluginManager.cs index d08b6eb..f7992d5 100644 --- a/OpenSim/Region/PhysicsModules/SharedBase/PhysicsPluginManager.cs +++ b/OpenSim/Region/PhysicsModules/SharedBase/PhysicsPluginManager.cs | |||
@@ -34,7 +34,7 @@ using log4net; | |||
34 | using OpenSim.Framework; | 34 | using OpenSim.Framework; |
35 | using OpenMetaverse; | 35 | using OpenMetaverse; |
36 | 36 | ||
37 | namespace OpenSim.Region.PhysicsModule.SharedBase | 37 | namespace OpenSim.Region.PhysicsModules.SharedBase |
38 | { | 38 | { |
39 | /// <summary> | 39 | /// <summary> |
40 | /// Description of MyClass. | 40 | /// Description of MyClass. |
@@ -129,8 +129,8 @@ namespace OpenSim.Region.PhysicsModule.SharedBase | |||
129 | public void LoadPluginsFromAssembly(string assemblyPath) | 129 | public void LoadPluginsFromAssembly(string assemblyPath) |
130 | { | 130 | { |
131 | // TODO / NOTE | 131 | // TODO / NOTE |
132 | // The assembly named 'OpenSim.Region.Physics.BasicPhysicsPlugin' was loaded from | 132 | // The assembly named 'OpenSim.Region.PhysicsModule.BasicPhysics' was loaded from |
133 | // 'file:///C:/OpenSim/trunk2/bin/Physics/OpenSim.Region.Physics.BasicPhysicsPlugin.dll' | 133 | // 'file:///C:/OpenSim/trunk2/bin/Physics/OpenSim.Region.PhysicsModule.BasicPhysics.dll' |
134 | // using the LoadFrom context. The use of this context can result in unexpected behavior | 134 | // using the LoadFrom context. The use of this context can result in unexpected behavior |
135 | // for serialization, casting and dependency resolution. In almost all cases, it is recommended | 135 | // for serialization, casting and dependency resolution. In almost all cases, it is recommended |
136 | // that the LoadFrom context be avoided. This can be done by installing assemblies in the | 136 | // that the LoadFrom context be avoided. This can be done by installing assemblies in the |
diff --git a/OpenSim/Region/PhysicsModules/SharedBase/PhysicsScene.cs b/OpenSim/Region/PhysicsModules/SharedBase/PhysicsScene.cs index be0d6f5..0394494 100644 --- a/OpenSim/Region/PhysicsModules/SharedBase/PhysicsScene.cs +++ b/OpenSim/Region/PhysicsModules/SharedBase/PhysicsScene.cs | |||
@@ -35,7 +35,7 @@ using Nini.Config; | |||
35 | using OpenSim.Framework; | 35 | using OpenSim.Framework; |
36 | using OpenMetaverse; | 36 | using OpenMetaverse; |
37 | 37 | ||
38 | namespace OpenSim.Region.PhysicsModule.SharedBase | 38 | namespace OpenSim.Region.PhysicsModules.SharedBase |
39 | { | 39 | { |
40 | public delegate void physicsCrash(); | 40 | public delegate void physicsCrash(); |
41 | 41 | ||
diff --git a/OpenSim/Region/PhysicsModules/SharedBase/PhysicsSensor.cs b/OpenSim/Region/PhysicsModules/SharedBase/PhysicsSensor.cs index f0bdd10..da9c96c 100644 --- a/OpenSim/Region/PhysicsModules/SharedBase/PhysicsSensor.cs +++ b/OpenSim/Region/PhysicsModules/SharedBase/PhysicsSensor.cs | |||
@@ -29,7 +29,7 @@ using System; | |||
29 | using System.Timers; | 29 | using System.Timers; |
30 | using OpenMetaverse; | 30 | using OpenMetaverse; |
31 | 31 | ||
32 | namespace OpenSim.Region.PhysicsModule.SharedBase | 32 | namespace OpenSim.Region.PhysicsModules.SharedBase |
33 | { | 33 | { |
34 | [Flags] | 34 | [Flags] |
35 | public enum SenseType : uint | 35 | public enum SenseType : uint |
diff --git a/OpenSim/Region/PhysicsModules/SharedBase/PhysicsVector.cs b/OpenSim/Region/PhysicsModules/SharedBase/PhysicsVector.cs index fba861b..76a82fa 100644 --- a/OpenSim/Region/PhysicsModules/SharedBase/PhysicsVector.cs +++ b/OpenSim/Region/PhysicsModules/SharedBase/PhysicsVector.cs | |||
@@ -27,7 +27,7 @@ | |||
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | 29 | ||
30 | namespace OpenSim.Region.PhysicsModule.SharedBase | 30 | namespace OpenSim.Region.PhysicsModules.SharedBase |
31 | { | 31 | { |
32 | /*public class PhysicsVector | 32 | /*public class PhysicsVector |
33 | { | 33 | { |
diff --git a/OpenSim/Region/PhysicsModules/SharedBase/VehicleConstants.cs b/OpenSim/Region/PhysicsModules/SharedBase/VehicleConstants.cs index 879e62a..63a8cb8 100644 --- a/OpenSim/Region/PhysicsModules/SharedBase/VehicleConstants.cs +++ b/OpenSim/Region/PhysicsModules/SharedBase/VehicleConstants.cs | |||
@@ -27,7 +27,7 @@ | |||
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | 29 | ||
30 | namespace OpenSim.Region.PhysicsModule.SharedBase | 30 | namespace OpenSim.Region.PhysicsModules.SharedBase |
31 | { | 31 | { |
32 | public enum Vehicle : int | 32 | public enum Vehicle : int |
33 | { | 33 | { |
diff --git a/OpenSim/Region/PhysicsModules/SharedBase/ZeroMesher.cs b/OpenSim/Region/PhysicsModules/SharedBase/ZeroMesher.cs index c938252..fe87962 100644 --- a/OpenSim/Region/PhysicsModules/SharedBase/ZeroMesher.cs +++ b/OpenSim/Region/PhysicsModules/SharedBase/ZeroMesher.cs | |||
@@ -41,7 +41,7 @@ using Nini.Config; | |||
41 | * it's always availabe and thus the default in case of configuration errors | 41 | * it's always availabe and thus the default in case of configuration errors |
42 | */ | 42 | */ |
43 | 43 | ||
44 | namespace OpenSim.Region.PhysicsModule.SharedBase | 44 | namespace OpenSim.Region.PhysicsModules.SharedBase |
45 | { | 45 | { |
46 | public class ZeroMesherPlugin : IMeshingPlugin | 46 | public class ZeroMesherPlugin : IMeshingPlugin |
47 | { | 47 | { |
diff --git a/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs b/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs index 695d72a..98b0ae1 100644 --- a/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs +++ b/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs | |||
@@ -36,7 +36,7 @@ using OpenSim.Framework.Client; | |||
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.Framework.Console; | 38 | using OpenSim.Framework.Console; |
39 | using OpenSim.Region.PhysicsModule.SharedBase; | 39 | using OpenSim.Region.PhysicsModules.SharedBase; |
40 | using Mono.Addins; | 40 | using Mono.Addins; |
41 | 41 | ||
42 | namespace OpenSim.Region.RegionCombinerModule | 42 | namespace OpenSim.Region.RegionCombinerModule |
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index 5d50a63..4eda443 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
@@ -51,7 +51,7 @@ using OpenSim.Region.Framework.Interfaces; | |||
51 | using OpenSim.Region.Framework.Scenes; | 51 | using OpenSim.Region.Framework.Scenes; |
52 | using OpenSim.Region.Framework.Scenes.Animation; | 52 | using OpenSim.Region.Framework.Scenes.Animation; |
53 | using OpenSim.Region.Framework.Scenes.Scripting; | 53 | using OpenSim.Region.Framework.Scenes.Scripting; |
54 | using OpenSim.Region.PhysicsModule.SharedBase; | 54 | using OpenSim.Region.PhysicsModules.SharedBase; |
55 | using OpenSim.Region.ScriptEngine.Shared; | 55 | using OpenSim.Region.ScriptEngine.Shared; |
56 | using OpenSim.Region.ScriptEngine.Shared.Api.Plugins; | 56 | using OpenSim.Region.ScriptEngine.Shared.Api.Plugins; |
57 | using OpenSim.Region.ScriptEngine.Shared.ScriptBase; | 57 | using OpenSim.Region.ScriptEngine.Shared.ScriptBase; |
diff --git a/OpenSim/Tests/Common/Helpers/SceneHelpers.cs b/OpenSim/Tests/Common/Helpers/SceneHelpers.cs index 7ee4c94..a26e844 100644 --- a/OpenSim/Tests/Common/Helpers/SceneHelpers.cs +++ b/OpenSim/Tests/Common/Helpers/SceneHelpers.cs | |||
@@ -36,7 +36,7 @@ using OpenSim.Framework.Communications; | |||
36 | using OpenSim.Framework.Console; | 36 | using OpenSim.Framework.Console; |
37 | using OpenSim.Framework.Servers; | 37 | using OpenSim.Framework.Servers; |
38 | using OpenSim.Framework.Servers.HttpServer; | 38 | using OpenSim.Framework.Servers.HttpServer; |
39 | using OpenSim.Region.PhysicsModule.SharedBase; | 39 | using OpenSim.Region.PhysicsModules.SharedBase; |
40 | using OpenSim.Region.Framework; | 40 | using OpenSim.Region.Framework; |
41 | using OpenSim.Region.Framework.Interfaces; | 41 | using OpenSim.Region.Framework.Interfaces; |
42 | using OpenSim.Region.Framework.Scenes; | 42 | using OpenSim.Region.Framework.Scenes; |
@@ -149,7 +149,7 @@ namespace OpenSim.Tests.Common | |||
149 | regInfo.RegionSizeY = sizeY; | 149 | regInfo.RegionSizeY = sizeY; |
150 | 150 | ||
151 | PhysicsPluginManager physicsPluginManager = new PhysicsPluginManager(); | 151 | PhysicsPluginManager physicsPluginManager = new PhysicsPluginManager(); |
152 | physicsPluginManager.LoadPluginsFromAssembly("Physics/OpenSim.Region.Physics.BasicPhysicsPlugin.dll"); | 152 | physicsPluginManager.LoadPluginsFromAssembly("Physics/OpenSim.Region.PhysicsModule.BasicPhysics.dll"); |
153 | Vector3 regionExtent = new Vector3( regInfo.RegionSizeX, regInfo.RegionSizeY, regInfo.RegionSizeZ); | 153 | Vector3 regionExtent = new Vector3( regInfo.RegionSizeX, regInfo.RegionSizeY, regInfo.RegionSizeZ); |
154 | PhysicsScene physicsScene | 154 | PhysicsScene physicsScene |
155 | = physicsPluginManager.GetPhysicsScene( | 155 | = physicsPluginManager.GetPhysicsScene( |
diff --git a/OpenSim/Tests/Common/Mock/TestScene.cs b/OpenSim/Tests/Common/Mock/TestScene.cs index 8a9e279..08cfff2 100644 --- a/OpenSim/Tests/Common/Mock/TestScene.cs +++ b/OpenSim/Tests/Common/Mock/TestScene.cs | |||
@@ -33,7 +33,7 @@ using OpenSim.Framework.Servers; | |||
33 | using OpenSim.Region.Framework; | 33 | using OpenSim.Region.Framework; |
34 | using OpenSim.Region.Framework.Interfaces; | 34 | using OpenSim.Region.Framework.Interfaces; |
35 | using OpenSim.Region.Framework.Scenes; | 35 | using OpenSim.Region.Framework.Scenes; |
36 | using OpenSim.Region.PhysicsModule.SharedBase; | 36 | using OpenSim.Region.PhysicsModules.SharedBase; |
37 | using OpenSim.Services.Interfaces; | 37 | using OpenSim.Services.Interfaces; |
38 | 38 | ||
39 | namespace OpenSim.Tests.Common | 39 | namespace OpenSim.Tests.Common |
diff --git a/prebuild.xml b/prebuild.xml index f1ab322..92d5caf 100644 --- a/prebuild.xml +++ b/prebuild.xml | |||
@@ -410,7 +410,7 @@ | |||
410 | </Files> | 410 | </Files> |
411 | </Project> | 411 | </Project> |
412 | 412 | ||
413 | <Project frameworkVersion="v4_0" name="OpenSim.Region.PhysicsModule.SharedBase" path="OpenSim/Region/PhysicsModules/SharedBase" type="Library"> | 413 | <Project frameworkVersion="v4_0" name="OpenSim.Region.PhysicsModules.SharedBase" path="OpenSim/Region/PhysicsModules/SharedBase" type="Library"> |
414 | <Configuration name="Debug"> | 414 | <Configuration name="Debug"> |
415 | <Options> | 415 | <Options> |
416 | <OutputPath>../../../../bin/</OutputPath> | 416 | <OutputPath>../../../../bin/</OutputPath> |
@@ -438,7 +438,7 @@ | |||
438 | </Project> | 438 | </Project> |
439 | 439 | ||
440 | <!-- Physics Plug-ins --> | 440 | <!-- Physics Plug-ins --> |
441 | <Project frameworkVersion="v4_0" name="OpenSim.Region.PhysicsModule.BasicPhysics" path="OpenSim/Region/Physics/BasicPhysics" type="Library"> | 441 | <Project frameworkVersion="v4_0" name="OpenSim.Region.PhysicsModule.BasicPhysics" path="OpenSim/Region/PhysicsModules/BasicPhysics" type="Library"> |
442 | <Configuration name="Debug"> | 442 | <Configuration name="Debug"> |
443 | <Options> | 443 | <Options> |
444 | <OutputPath>../../../../bin/Physics/</OutputPath> | 444 | <OutputPath>../../../../bin/Physics/</OutputPath> |
@@ -455,7 +455,7 @@ | |||
455 | <Reference name="OpenMetaverseTypes" path="../../../../bin/"/> | 455 | <Reference name="OpenMetaverseTypes" path="../../../../bin/"/> |
456 | <Reference name="Nini" path="../../../../bin/"/> | 456 | <Reference name="Nini" path="../../../../bin/"/> |
457 | <Reference name="OpenSim.Framework"/> | 457 | <Reference name="OpenSim.Framework"/> |
458 | <Reference name="OpenSim.Region.PhysicsModule.SharedBase"/> | 458 | <Reference name="OpenSim.Region.PhysicsModules.SharedBase"/> |
459 | <Files> | 459 | <Files> |
460 | <Match pattern="*.cs" recurse="true"/> | 460 | <Match pattern="*.cs" recurse="true"/> |
461 | </Files> | 461 | </Files> |
@@ -478,7 +478,7 @@ | |||
478 | <Reference name="OpenMetaverseTypes" path="../../../../bin/"/> | 478 | <Reference name="OpenMetaverseTypes" path="../../../../bin/"/> |
479 | <Reference name="Nini" path="../../../../bin/"/> | 479 | <Reference name="Nini" path="../../../../bin/"/> |
480 | <Reference name="OpenSim.Framework"/> | 480 | <Reference name="OpenSim.Framework"/> |
481 | <Reference name="OpenSim.Region.PhysicsModule.SharedBase"/> | 481 | <Reference name="OpenSim.Region.PhysicsModules.SharedBase"/> |
482 | <Files> | 482 | <Files> |
483 | <Match pattern="*.cs" recurse="true"/> | 483 | <Match pattern="*.cs" recurse="true"/> |
484 | </Files> | 484 | </Files> |
@@ -503,7 +503,7 @@ | |||
503 | <Reference name="Nini" path="../../../../bin/"/> | 503 | <Reference name="Nini" path="../../../../bin/"/> |
504 | <Reference name="OpenSim.Framework"/> | 504 | <Reference name="OpenSim.Framework"/> |
505 | <Reference name="OpenSim.Framework.Console"/> | 505 | <Reference name="OpenSim.Framework.Console"/> |
506 | <Reference name="OpenSim.Region.PhysicsModule.SharedBase"/> | 506 | <Reference name="OpenSim.Region.PhysicsModules.SharedBase"/> |
507 | <Reference name="Ode.NET" path="../../../../bin/"/> | 507 | <Reference name="Ode.NET" path="../../../../bin/"/> |
508 | <Reference name="log4net" path="../../../../bin/"/> | 508 | <Reference name="log4net" path="../../../../bin/"/> |
509 | 509 | ||
@@ -536,7 +536,7 @@ | |||
536 | <Reference name="Nini" path="../../../../bin/"/> | 536 | <Reference name="Nini" path="../../../../bin/"/> |
537 | <Reference name="OpenSim.Framework"/> | 537 | <Reference name="OpenSim.Framework"/> |
538 | <Reference name="OpenSim.Framework.Console"/> | 538 | <Reference name="OpenSim.Framework.Console"/> |
539 | <Reference name="OpenSim.Region.PhysicsModule.SharedBase"/> | 539 | <Reference name="OpenSim.Region.PhysicsModules.SharedBase"/> |
540 | <Reference name="log4net" path="../../../../bin/"/> | 540 | <Reference name="log4net" path="../../../../bin/"/> |
541 | 541 | ||
542 | <Files> | 542 | <Files> |
@@ -653,7 +653,7 @@ | |||
653 | <Reference name="OpenSim.Framework.Serialization"/> | 653 | <Reference name="OpenSim.Framework.Serialization"/> |
654 | <Reference name="OpenSim.Framework.Servers"/> | 654 | <Reference name="OpenSim.Framework.Servers"/> |
655 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> | 655 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> |
656 | <Reference name="OpenSim.Region.PhysicsModule.SharedBase"/> | 656 | <Reference name="OpenSim.Region.PhysicsModules.SharedBase"/> |
657 | 657 | ||
658 | <!-- For scripting in funny languages by default --> | 658 | <!-- For scripting in funny languages by default --> |
659 | <Reference name="XMLRPC" path="../../../bin/"/> | 659 | <Reference name="XMLRPC" path="../../../bin/"/> |
@@ -1507,7 +1507,7 @@ | |||
1507 | <Reference name="OpenSim.Framework.Servers"/> | 1507 | <Reference name="OpenSim.Framework.Servers"/> |
1508 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> | 1508 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> |
1509 | <Reference name="OpenSim.Framework.Communications"/> | 1509 | <Reference name="OpenSim.Framework.Communications"/> |
1510 | <Reference name="OpenSim.Region.PhysicsModule.SharedBase"/> | 1510 | <Reference name="OpenSim.Region.PhysicsModules.SharedBase"/> |
1511 | <Reference name="OpenSim.Services.Interfaces"/> | 1511 | <Reference name="OpenSim.Services.Interfaces"/> |
1512 | <Reference name="XMLRPC" path="../../../bin/"/> | 1512 | <Reference name="XMLRPC" path="../../../bin/"/> |
1513 | <Reference name="Nini" path="../../../bin/"/> | 1513 | <Reference name="Nini" path="../../../bin/"/> |
@@ -1594,7 +1594,7 @@ | |||
1594 | <Reference name="OpenSim.Framework.Servers"/> | 1594 | <Reference name="OpenSim.Framework.Servers"/> |
1595 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> | 1595 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> |
1596 | <Reference name="OpenSim.Framework.Console"/> | 1596 | <Reference name="OpenSim.Framework.Console"/> |
1597 | <Reference name="OpenSim.Region.PhysicsModule.SharedBase"/> | 1597 | <Reference name="OpenSim.Region.PhysicsModules.SharedBase"/> |
1598 | <Reference name="OpenSim.Services.Interfaces"/> | 1598 | <Reference name="OpenSim.Services.Interfaces"/> |
1599 | <Reference name="Mono.Addins" path="../../../../../bin/"/> | 1599 | <Reference name="Mono.Addins" path="../../../../../bin/"/> |
1600 | <Reference name="Nini" path="../../../../../bin/"/> | 1600 | <Reference name="Nini" path="../../../../../bin/"/> |
@@ -1648,7 +1648,7 @@ | |||
1648 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> | 1648 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> |
1649 | <Reference name="OpenSim.Region.ClientStack.LindenUDP"/> | 1649 | <Reference name="OpenSim.Region.ClientStack.LindenUDP"/> |
1650 | <Reference name="OpenSim.Region.Framework"/> | 1650 | <Reference name="OpenSim.Region.Framework"/> |
1651 | <Reference name="OpenSim.Region.PhysicsModule.SharedBase"/> | 1651 | <Reference name="OpenSim.Region.PhysicsModules.SharedBase"/> |
1652 | <Reference name="OpenSim.Server.Base"/> | 1652 | <Reference name="OpenSim.Server.Base"/> |
1653 | <Reference name="OpenSim.Server.Handlers"/> | 1653 | <Reference name="OpenSim.Server.Handlers"/> |
1654 | <Reference name="OpenSim.Services.Connectors"/> | 1654 | <Reference name="OpenSim.Services.Connectors"/> |
@@ -1700,7 +1700,7 @@ | |||
1700 | <Reference name="OpenSim.Server.Base"/> | 1700 | <Reference name="OpenSim.Server.Base"/> |
1701 | <Reference name="OpenSim.Server.Handlers"/> | 1701 | <Reference name="OpenSim.Server.Handlers"/> |
1702 | <Reference name="OpenSim.Framework.Console"/> | 1702 | <Reference name="OpenSim.Framework.Console"/> |
1703 | <Reference name="OpenSim.Region.PhysicsModule.SharedBase"/> | 1703 | <Reference name="OpenSim.Region.PhysicsModules.SharedBase"/> |
1704 | <Reference name="OpenSim.Framework.Communications"/> | 1704 | <Reference name="OpenSim.Framework.Communications"/> |
1705 | <Reference name="OpenSim.Region.CoreModules"/> | 1705 | <Reference name="OpenSim.Region.CoreModules"/> |
1706 | <Reference name="Nini" path="../../../bin/"/> | 1706 | <Reference name="Nini" path="../../../bin/"/> |
@@ -1749,7 +1749,7 @@ | |||
1749 | <Reference name="OpenSim.Region.CoreModules"/> | 1749 | <Reference name="OpenSim.Region.CoreModules"/> |
1750 | <Reference name="OpenSim.Region.ClientStack.LindenUDP"/> | 1750 | <Reference name="OpenSim.Region.ClientStack.LindenUDP"/> |
1751 | <Reference name="OpenSim.Region.Framework"/> | 1751 | <Reference name="OpenSim.Region.Framework"/> |
1752 | <Reference name="OpenSim.Region.PhysicsModule.SharedBase"/> | 1752 | <Reference name="OpenSim.Region.PhysicsModules.SharedBase"/> |
1753 | <Reference name="OpenSim.Server.Base"/> | 1753 | <Reference name="OpenSim.Server.Base"/> |
1754 | <Reference name="OpenSim.Server.Handlers"/> | 1754 | <Reference name="OpenSim.Server.Handlers"/> |
1755 | <Reference name="OpenSim.Services.Connectors"/> | 1755 | <Reference name="OpenSim.Services.Connectors"/> |
@@ -1852,7 +1852,7 @@ | |||
1852 | <Reference name="OpenSim.Region.CoreModules"/> | 1852 | <Reference name="OpenSim.Region.CoreModules"/> |
1853 | <Reference name="OpenSim.Region.OptionalModules"/> | 1853 | <Reference name="OpenSim.Region.OptionalModules"/> |
1854 | <Reference name="OpenSim.Framework.Console"/> | 1854 | <Reference name="OpenSim.Framework.Console"/> |
1855 | <Reference name="OpenSim.Region.PhysicsModule.SharedBase"/> | 1855 | <Reference name="OpenSim.Region.PhysicsModules.SharedBase"/> |
1856 | <Reference name="OpenSim.Region.PhysicsModule.Meshing" path="../../../../bin/Physics/"/> | 1856 | <Reference name="OpenSim.Region.PhysicsModule.Meshing" path="../../../../bin/Physics/"/> |
1857 | <Reference name="OpenSim.Region.PhysicsModule.ConvexDecompositionDotNet"/> | 1857 | <Reference name="OpenSim.Region.PhysicsModule.ConvexDecompositionDotNet"/> |
1858 | <Reference name="BulletXNA.dll" path="../../../../bin/"/> | 1858 | <Reference name="BulletXNA.dll" path="../../../../bin/"/> |
@@ -1897,7 +1897,7 @@ | |||
1897 | <Reference name="OpenSim.Region.Framework"/> | 1897 | <Reference name="OpenSim.Region.Framework"/> |
1898 | <Reference name="OpenSim.Region.CoreModules"/> | 1898 | <Reference name="OpenSim.Region.CoreModules"/> |
1899 | <Reference name="OpenSim.Region.ClientStack"/> | 1899 | <Reference name="OpenSim.Region.ClientStack"/> |
1900 | <Reference name="OpenSim.Region.PhysicsModule.SharedBase"/> | 1900 | <Reference name="OpenSim.Region.PhysicsModules.SharedBase"/> |
1901 | <Reference name="OpenSim.Server.Base"/> | 1901 | <Reference name="OpenSim.Server.Base"/> |
1902 | <Reference name="OpenSim.Services.Base"/> | 1902 | <Reference name="OpenSim.Services.Base"/> |
1903 | <Reference name="OpenSim.Services.Interfaces"/> | 1903 | <Reference name="OpenSim.Services.Interfaces"/> |
@@ -2270,7 +2270,7 @@ | |||
2270 | <Reference name="OpenSim.Framework.Monitoring"/> | 2270 | <Reference name="OpenSim.Framework.Monitoring"/> |
2271 | <Reference name="OpenSim.Region.Framework"/> | 2271 | <Reference name="OpenSim.Region.Framework"/> |
2272 | <Reference name="OpenSim.Region.CoreModules"/> | 2272 | <Reference name="OpenSim.Region.CoreModules"/> |
2273 | <Reference name="OpenSim.Region.PhysicsModule.SharedBase"/> | 2273 | <Reference name="OpenSim.Region.PhysicsModules.SharedBase"/> |
2274 | <Reference name="OpenSim.Services.Interfaces"/> | 2274 | <Reference name="OpenSim.Services.Interfaces"/> |
2275 | <Reference name="OpenSim.Services.Connectors"/> | 2275 | <Reference name="OpenSim.Services.Connectors"/> |
2276 | <Reference name="OpenSim.Region.ScriptEngine.Shared"/> | 2276 | <Reference name="OpenSim.Region.ScriptEngine.Shared"/> |
@@ -2464,7 +2464,7 @@ | |||
2464 | <Reference name="OpenSim.Framework.Monitoring"/> | 2464 | <Reference name="OpenSim.Framework.Monitoring"/> |
2465 | <Reference name="OpenSim.Framework.Servers"/> | 2465 | <Reference name="OpenSim.Framework.Servers"/> |
2466 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> | 2466 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> |
2467 | <Reference name="OpenSim.Region.PhysicsModule.SharedBase"/> | 2467 | <Reference name="OpenSim.Region.PhysicsModules.SharedBase"/> |
2468 | <Reference name="Mono.Data.SqliteClient" path="../../../bin/"/> | 2468 | <Reference name="Mono.Data.SqliteClient" path="../../../bin/"/> |
2469 | <Reference name="Mono.Addins" path="../../../bin/"/> | 2469 | <Reference name="Mono.Addins" path="../../../bin/"/> |
2470 | 2470 | ||
@@ -2729,7 +2729,7 @@ | |||
2729 | <Reference name="OpenSim.Region.ClientStack.LindenUDP"/> | 2729 | <Reference name="OpenSim.Region.ClientStack.LindenUDP"/> |
2730 | <Reference name="OpenSim.Region.Framework"/> | 2730 | <Reference name="OpenSim.Region.Framework"/> |
2731 | <Reference name="OpenSim.Region.OptionalModules"/> | 2731 | <Reference name="OpenSim.Region.OptionalModules"/> |
2732 | <Reference name="OpenSim.Region.PhysicsModule.SharedBase"/> | 2732 | <Reference name="OpenSim.Region.PhysicsModules.SharedBase"/> |
2733 | <Reference name="OpenSim.Region.ScriptEngine.Shared"/> | 2733 | <Reference name="OpenSim.Region.ScriptEngine.Shared"/> |
2734 | <Reference name="OpenSim.Server.Base"/> | 2734 | <Reference name="OpenSim.Server.Base"/> |
2735 | <Reference name="OpenSim.Services.Interfaces"/> | 2735 | <Reference name="OpenSim.Services.Interfaces"/> |
@@ -3056,7 +3056,7 @@ | |||
3056 | <Reference name="OpenSim.Region.Framework"/> | 3056 | <Reference name="OpenSim.Region.Framework"/> |
3057 | <Reference name="OpenSim.Region.CoreModules"/> | 3057 | <Reference name="OpenSim.Region.CoreModules"/> |
3058 | <Reference name="OpenSim.Region.OptionalModules"/> | 3058 | <Reference name="OpenSim.Region.OptionalModules"/> |
3059 | <Reference name="OpenSim.Region.PhysicsModule.SharedBase"/> | 3059 | <Reference name="OpenSim.Region.PhysicsModules.SharedBase"/> |
3060 | <Reference name="OpenSim.Region.ScriptEngine.Shared"/> | 3060 | <Reference name="OpenSim.Region.ScriptEngine.Shared"/> |
3061 | <Reference name="OpenSim.Region.ScriptEngine.XEngine"/> | 3061 | <Reference name="OpenSim.Region.ScriptEngine.XEngine"/> |
3062 | <Reference name="OpenSim.Services.Interfaces"/> | 3062 | <Reference name="OpenSim.Services.Interfaces"/> |
@@ -3136,7 +3136,7 @@ | |||
3136 | <Reference name="OpenSim.Region.Framework"/> | 3136 | <Reference name="OpenSim.Region.Framework"/> |
3137 | <Reference name="OpenSim.Region.CoreModules"/> | 3137 | <Reference name="OpenSim.Region.CoreModules"/> |
3138 | <Reference name="OpenSim.Region.OptionalModules"/> | 3138 | <Reference name="OpenSim.Region.OptionalModules"/> |
3139 | <Reference name="OpenSim.Region.PhysicsModule.SharedBase"/> | 3139 | <Reference name="OpenSim.Region.PhysicsModules.SharedBase"/> |
3140 | <Reference name="OpenSim.Region.ScriptEngine.Shared"/> | 3140 | <Reference name="OpenSim.Region.ScriptEngine.Shared"/> |
3141 | <Reference name="OpenSim.Services.AvatarService"/> | 3141 | <Reference name="OpenSim.Services.AvatarService"/> |
3142 | <Reference name="OpenSim.Services.Interfaces"/> | 3142 | <Reference name="OpenSim.Services.Interfaces"/> |
@@ -3204,7 +3204,7 @@ | |||
3204 | <Reference name="OpenSim.Region.Framework"/> | 3204 | <Reference name="OpenSim.Region.Framework"/> |
3205 | <Reference name="OpenSim.Region.CoreModules"/> | 3205 | <Reference name="OpenSim.Region.CoreModules"/> |
3206 | <Reference name="OpenSim.Region.OptionalModules"/> | 3206 | <Reference name="OpenSim.Region.OptionalModules"/> |
3207 | <Reference name="OpenSim.Region.PhysicsModule.SharedBase"/> | 3207 | <Reference name="OpenSim.Region.PhysicsModules.SharedBase"/> |
3208 | <Reference name="OpenSim.Services.Interfaces"/> | 3208 | <Reference name="OpenSim.Services.Interfaces"/> |
3209 | 3209 | ||
3210 | <!-- Unit tests --> | 3210 | <!-- Unit tests --> |
@@ -3388,7 +3388,7 @@ | |||
3388 | <Reference name="Nini" path="../../../../../bin/"/> | 3388 | <Reference name="Nini" path="../../../../../bin/"/> |
3389 | <Reference name="OpenSim.Framework"/> | 3389 | <Reference name="OpenSim.Framework"/> |
3390 | <Reference name="OpenSim.Framework.Console"/> | 3390 | <Reference name="OpenSim.Framework.Console"/> |
3391 | <Reference name="OpenSim.Region.PhysicsModule.SharedBase"/> | 3391 | <Reference name="OpenSim.Region.PhysicsModules.SharedBase"/> |
3392 | <Reference name="OpenSim.Region.PhysicsModule.Ode" path="../../../../../bin/Physics/"/> | 3392 | <Reference name="OpenSim.Region.PhysicsModule.Ode" path="../../../../../bin/Physics/"/> |
3393 | <Reference name="OpenSim.Tests.Common"/> | 3393 | <Reference name="OpenSim.Tests.Common"/> |
3394 | <Reference name="Ode.NET" path="../../../../../bin/"/> | 3394 | <Reference name="Ode.NET" path="../../../../../bin/"/> |
@@ -3425,7 +3425,7 @@ | |||
3425 | <Reference name="OpenSim.Tests.Common"/> | 3425 | <Reference name="OpenSim.Tests.Common"/> |
3426 | <Reference name="OpenSim.Region.CoreModules"/> | 3426 | <Reference name="OpenSim.Region.CoreModules"/> |
3427 | <Reference name="OpenSim.Region.PhysicsModule.Meshing" path="../../../../../bin/Physics/"/> | 3427 | <Reference name="OpenSim.Region.PhysicsModule.Meshing" path="../../../../../bin/Physics/"/> |
3428 | <Reference name="OpenSim.Region.PhysicsModule.SharedBase"/> | 3428 | <Reference name="OpenSim.Region.PhysicsModules.SharedBase"/> |
3429 | <Reference name="OpenSim.Region.PhysicsModule.BulletS" path="../../../../../bin/Physics/"/> | 3429 | <Reference name="OpenSim.Region.PhysicsModule.BulletS" path="../../../../../bin/Physics/"/> |
3430 | 3430 | ||
3431 | <Files> | 3431 | <Files> |