aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/PhysicsModules/UbitOde
diff options
context:
space:
mode:
authorUbitUmarov2015-09-08 20:03:54 +0100
committerUbitUmarov2015-09-08 20:03:54 +0100
commit40fd7cbf7478b4b3966ef49728974ba3f75512dd (patch)
treee40872070b926d26100d5a79c304e31420da551f /OpenSim/Region/PhysicsModules/UbitOde
parentmore on compile.. (diff)
downloadopensim-SC_OLD-40fd7cbf7478b4b3966ef49728974ba3f75512dd.zip
opensim-SC_OLD-40fd7cbf7478b4b3966ef49728974ba3f75512dd.tar.gz
opensim-SC_OLD-40fd7cbf7478b4b3966ef49728974ba3f75512dd.tar.bz2
opensim-SC_OLD-40fd7cbf7478b4b3966ef49728974ba3f75512dd.tar.xz
a mess with Modules and Module
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/PhysicsModules/UbitOde/ODECharacter.cs2
-rw-r--r--OpenSim/Region/PhysicsModules/UbitOde/ODEDynamics.cs2
-rw-r--r--OpenSim/Region/PhysicsModules/UbitOde/ODEMeshWorker.cs2
-rw-r--r--OpenSim/Region/PhysicsModules/UbitOde/ODEPrim.cs2
-rw-r--r--OpenSim/Region/PhysicsModules/UbitOde/ODERayCastRequestManager.cs2
-rw-r--r--OpenSim/Region/PhysicsModules/UbitOde/ODESitAvatar.cs2
-rw-r--r--OpenSim/Region/PhysicsModules/UbitOde/OdeScene.cs3
7 files changed, 8 insertions, 7 deletions
diff --git a/OpenSim/Region/PhysicsModules/UbitOde/ODECharacter.cs b/OpenSim/Region/PhysicsModules/UbitOde/ODECharacter.cs
index 0edc46f..5622e48 100644
--- a/OpenSim/Region/PhysicsModules/UbitOde/ODECharacter.cs
+++ b/OpenSim/Region/PhysicsModules/UbitOde/ODECharacter.cs
@@ -37,7 +37,7 @@ using OpenSim.Framework;
37using OpenSim.Region.PhysicsModules.SharedBase; 37using OpenSim.Region.PhysicsModules.SharedBase;
38using log4net; 38using log4net;
39 39
40namespace OpenSim.Region.PhysicsModules.UbitOde 40namespace OpenSim.Region.PhysicsModule.UbitOde
41{ 41{
42 /// <summary> 42 /// <summary>
43 /// Various properties that ODE uses for AMotors but isn't exposed in ODE.NET so we must define them ourselves. 43 /// Various properties that ODE uses for AMotors but isn't exposed in ODE.NET so we must define them ourselves.
diff --git a/OpenSim/Region/PhysicsModules/UbitOde/ODEDynamics.cs b/OpenSim/Region/PhysicsModules/UbitOde/ODEDynamics.cs
index 89adab8..abe6f37 100644
--- a/OpenSim/Region/PhysicsModules/UbitOde/ODEDynamics.cs
+++ b/OpenSim/Region/PhysicsModules/UbitOde/ODEDynamics.cs
@@ -50,7 +50,7 @@ using OdeAPI;
50using OpenSim.Framework; 50using OpenSim.Framework;
51using OpenSim.Region.PhysicsModules.SharedBase; 51using OpenSim.Region.PhysicsModules.SharedBase;
52 52
53namespace OpenSim.Region.PhysicsModules.UbitOde 53namespace OpenSim.Region.PhysicsModule.UbitOde
54{ 54{
55 public class ODEDynamics 55 public class ODEDynamics
56 { 56 {
diff --git a/OpenSim/Region/PhysicsModules/UbitOde/ODEMeshWorker.cs b/OpenSim/Region/PhysicsModules/UbitOde/ODEMeshWorker.cs
index 6fb10b1..330b191 100644
--- a/OpenSim/Region/PhysicsModules/UbitOde/ODEMeshWorker.cs
+++ b/OpenSim/Region/PhysicsModules/UbitOde/ODEMeshWorker.cs
@@ -16,7 +16,7 @@ using log4net;
16using Nini.Config; 16using Nini.Config;
17using OpenMetaverse; 17using OpenMetaverse;
18 18
19namespace OpenSim.Region.PhysicsModules.UbitOde 19namespace OpenSim.Region.PhysicsModule.UbitOde
20{ 20{
21 public enum MeshState : byte 21 public enum MeshState : byte
22 { 22 {
diff --git a/OpenSim/Region/PhysicsModules/UbitOde/ODEPrim.cs b/OpenSim/Region/PhysicsModules/UbitOde/ODEPrim.cs
index 344cfcc..8e8e069 100644
--- a/OpenSim/Region/PhysicsModules/UbitOde/ODEPrim.cs
+++ b/OpenSim/Region/PhysicsModules/UbitOde/ODEPrim.cs
@@ -57,7 +57,7 @@ using OdeAPI;
57using OpenSim.Framework; 57using OpenSim.Framework;
58using OpenSim.Region.PhysicsModules.SharedBase; 58using OpenSim.Region.PhysicsModules.SharedBase;
59 59
60namespace OpenSim.Region.PhysicsModules.UbitOde 60namespace OpenSim.Region.PhysicsModule.UbitOde
61{ 61{
62 public class OdePrim : PhysicsActor 62 public class OdePrim : PhysicsActor
63 { 63 {
diff --git a/OpenSim/Region/PhysicsModules/UbitOde/ODERayCastRequestManager.cs b/OpenSim/Region/PhysicsModules/UbitOde/ODERayCastRequestManager.cs
index eac4515..6b3672a 100644
--- a/OpenSim/Region/PhysicsModules/UbitOde/ODERayCastRequestManager.cs
+++ b/OpenSim/Region/PhysicsModules/UbitOde/ODERayCastRequestManager.cs
@@ -36,7 +36,7 @@ using OdeAPI;
36using log4net; 36using log4net;
37using OpenMetaverse; 37using OpenMetaverse;
38 38
39namespace OpenSim.Region.PhysicsModules.UbitOde 39namespace OpenSim.Region.PhysicsModule.UbitOde
40{ 40{
41 /// <summary> 41 /// <summary>
42 /// Processes raycast requests as ODE is in a state to be able to do them. 42 /// Processes raycast requests as ODE is in a state to be able to do them.
diff --git a/OpenSim/Region/PhysicsModules/UbitOde/ODESitAvatar.cs b/OpenSim/Region/PhysicsModules/UbitOde/ODESitAvatar.cs
index b1c758e..ef828de 100644
--- a/OpenSim/Region/PhysicsModules/UbitOde/ODESitAvatar.cs
+++ b/OpenSim/Region/PhysicsModules/UbitOde/ODESitAvatar.cs
@@ -36,7 +36,7 @@ using OdeAPI;
36using log4net; 36using log4net;
37using OpenMetaverse; 37using OpenMetaverse;
38 38
39namespace OpenSim.Region.PhysicsModules.UbitOde 39namespace OpenSim.Region.PhysicsModule.UbitOde
40{ 40{
41 /// <summary> 41 /// <summary>
42 /// </summary> 42 /// </summary>
diff --git a/OpenSim/Region/PhysicsModules/UbitOde/OdeScene.cs b/OpenSim/Region/PhysicsModules/UbitOde/OdeScene.cs
index 4031f0d..7211774 100644
--- a/OpenSim/Region/PhysicsModules/UbitOde/OdeScene.cs
+++ b/OpenSim/Region/PhysicsModules/UbitOde/OdeScene.cs
@@ -45,7 +45,7 @@ using OpenSim.Region.Framework.Interfaces;
45using OpenSim.Region.PhysicsModules.SharedBase; 45using OpenSim.Region.PhysicsModules.SharedBase;
46using OpenMetaverse; 46using OpenMetaverse;
47 47
48namespace OpenSim.Region.PhysicsModules.UbitOde 48namespace OpenSim.Region.PhysicsModule.UbitOde
49{ 49{
50 // colision flags of things others can colide with 50 // colision flags of things others can colide with
51 // rays, sensors, probes removed since can't be colided with 51 // rays, sensors, probes removed since can't be colided with
@@ -384,6 +384,7 @@ namespace OpenSim.Region.PhysicsModules.UbitOde
384 PhysicsSceneName = EngineType + "/" + scene.RegionInfo.RegionName; 384 PhysicsSceneName = EngineType + "/" + scene.RegionInfo.RegionName;
385 385
386 scene.RegisterModuleInterface<PhysicsScene>(this); 386 scene.RegisterModuleInterface<PhysicsScene>(this);
387
387 Vector3 extent = new Vector3(scene.RegionInfo.RegionSizeX, scene.RegionInfo.RegionSizeY, scene.RegionInfo.RegionSizeZ); 388 Vector3 extent = new Vector3(scene.RegionInfo.RegionSizeX, scene.RegionInfo.RegionSizeY, scene.RegionInfo.RegionSizeZ);
388 389
389 Initialization(extent); 390 Initialization(extent);