aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/PhysicsModules
diff options
context:
space:
mode:
authorUbitUmarov2015-11-21 00:49:43 +0000
committerUbitUmarov2015-11-21 00:49:43 +0000
commit36426b0db219d005b4cba193c20c31fa8571966c (patch)
treec0fd15a36a86389cac36cf03455afc75c66a2e00 /OpenSim/Region/PhysicsModules
parent stop the Vehicle AFTER fixing position not before, bc stop code also updates... (diff)
downloadopensim-SC_OLD-36426b0db219d005b4cba193c20c31fa8571966c.zip
opensim-SC_OLD-36426b0db219d005b4cba193c20c31fa8571966c.tar.gz
opensim-SC_OLD-36426b0db219d005b4cba193c20c31fa8571966c.tar.bz2
opensim-SC_OLD-36426b0db219d005b4cba193c20c31fa8571966c.tar.xz
remove some compile warnings increasing total number by 2
Diffstat (limited to 'OpenSim/Region/PhysicsModules')
-rw-r--r--OpenSim/Region/PhysicsModules/Ode/ODECharacter.cs2
-rw-r--r--OpenSim/Region/PhysicsModules/Ode/ODEPrim.cs2
2 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/PhysicsModules/Ode/ODECharacter.cs b/OpenSim/Region/PhysicsModules/Ode/ODECharacter.cs
index 4c9df9c..f535c41 100644
--- a/OpenSim/Region/PhysicsModules/Ode/ODECharacter.cs
+++ b/OpenSim/Region/PhysicsModules/Ode/ODECharacter.cs
@@ -1290,7 +1290,7 @@ namespace OpenSim.Region.PhysicsModule.ODE
1290 m_eventsubscription = 0; 1290 m_eventsubscription = 0;
1291 } 1291 }
1292 1292
1293 internal void AddCollisionEvent(uint CollidedWith, ContactPoint contact) 1293 public override void AddCollisionEvent(uint CollidedWith, ContactPoint contact)
1294 { 1294 {
1295 if (m_eventsubscription > 0) 1295 if (m_eventsubscription > 0)
1296 { 1296 {
diff --git a/OpenSim/Region/PhysicsModules/Ode/ODEPrim.cs b/OpenSim/Region/PhysicsModules/Ode/ODEPrim.cs
index ac082cb..8f2215a 100644
--- a/OpenSim/Region/PhysicsModules/Ode/ODEPrim.cs
+++ b/OpenSim/Region/PhysicsModules/Ode/ODEPrim.cs
@@ -3124,7 +3124,7 @@ Console.WriteLine(" JointCreateFixed");
3124 m_eventsubscription = 0; 3124 m_eventsubscription = 0;
3125 } 3125 }
3126 3126
3127 public void AddCollisionEvent(uint CollidedWith, ContactPoint contact) 3127 public override void AddCollisionEvent(uint CollidedWith, ContactPoint contact)
3128 { 3128 {
3129 CollisionEventsThisFrame.AddCollider(CollidedWith, contact); 3129 CollisionEventsThisFrame.AddCollider(CollidedWith, contact);
3130 } 3130 }