aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics
diff options
context:
space:
mode:
authorMelanie2011-10-26 17:48:51 +0100
committerMelanie2011-10-26 17:48:51 +0100
commit6a96c9546d4fd89f6e9319246cc2270836cf19f7 (patch)
treee6492419b9a03cb78435e911b345b4a31f749162 /OpenSim/Region/Physics
parentMerge branch 'master' into bigmerge (diff)
parentMerge branch 'master' of /home/opensim/var/repo/opensim (diff)
downloadopensim-SC_OLD-6a96c9546d4fd89f6e9319246cc2270836cf19f7.zip
opensim-SC_OLD-6a96c9546d4fd89f6e9319246cc2270836cf19f7.tar.gz
opensim-SC_OLD-6a96c9546d4fd89f6e9319246cc2270836cf19f7.tar.bz2
opensim-SC_OLD-6a96c9546d4fd89f6e9319246cc2270836cf19f7.tar.xz
Merge branch 'master' into bigmerge
Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
Diffstat (limited to 'OpenSim/Region/Physics')
-rw-r--r--OpenSim/Region/Physics/ChOdePlugin/ODECharacter.cs2
-rw-r--r--OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs2
2 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Physics/ChOdePlugin/ODECharacter.cs b/OpenSim/Region/Physics/ChOdePlugin/ODECharacter.cs
index 1bce760..58e2e4c 100644
--- a/OpenSim/Region/Physics/ChOdePlugin/ODECharacter.cs
+++ b/OpenSim/Region/Physics/ChOdePlugin/ODECharacter.cs
@@ -1299,7 +1299,7 @@ namespace OpenSim.Region.Physics.OdePlugin
1299 { 1299 {
1300 if (m_eventsubscription > 0) 1300 if (m_eventsubscription > 0)
1301 { 1301 {
1302 CollisionEventsThisFrame.addCollider(CollidedWith, contact); 1302 CollisionEventsThisFrame.AddCollider(CollidedWith, contact);
1303 } 1303 }
1304 } 1304 }
1305 1305
diff --git a/OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs
index 82f1b94..5f802d0 100644
--- a/OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs
+++ b/OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs
@@ -2438,7 +2438,7 @@ Console.WriteLine("ODEPrim JointCreateFixed !!!");
2438 { 2438 {
2439 if (CollisionEventsThisFrame == null) 2439 if (CollisionEventsThisFrame == null)
2440 CollisionEventsThisFrame = new CollisionEventUpdate(); 2440 CollisionEventsThisFrame = new CollisionEventUpdate();
2441 CollisionEventsThisFrame.addCollider(CollidedWith, contact); 2441 CollisionEventsThisFrame.AddCollider(CollidedWith, contact);
2442 } 2442 }
2443 2443
2444 public void SendCollisions() 2444 public void SendCollisions()