aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorMelanie2013-01-24 00:27:00 +0000
committerMelanie2013-01-24 00:27:00 +0000
commit2ce4a758e2e790dc2f433dced7ff90d469430441 (patch)
tree23f65b0a407969480a518ed2e344b9698a70aec5 /OpenSim/Region
parentMerge branch 'master' into careminster (diff)
parentDisable the not very useful infinite recursion co-op termination tests for no... (diff)
downloadopensim-SC_OLD-2ce4a758e2e790dc2f433dced7ff90d469430441.zip
opensim-SC_OLD-2ce4a758e2e790dc2f433dced7ff90d469430441.tar.gz
opensim-SC_OLD-2ce4a758e2e790dc2f433dced7ff90d469430441.tar.bz2
opensim-SC_OLD-2ce4a758e2e790dc2f433dced7ff90d469430441.tar.xz
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/Physics/BulletSPlugin/BSApiTemplate.cs1
-rw-r--r--OpenSim/Region/Physics/BulletSPlugin/BSScene.cs5
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs1
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Instance/Tests/CoopTerminationTests.cs8
4 files changed, 11 insertions, 4 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSApiTemplate.cs b/OpenSim/Region/Physics/BulletSPlugin/BSApiTemplate.cs
index 2828cab..f25b447 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSApiTemplate.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSApiTemplate.cs
@@ -130,6 +130,7 @@ public struct CollisionDesc
130 public uint bID; 130 public uint bID;
131 public Vector3 point; 131 public Vector3 point;
132 public Vector3 normal; 132 public Vector3 normal;
133 public float penetration;
133} 134}
134[StructLayout(LayoutKind.Sequential)] 135[StructLayout(LayoutKind.Sequential)]
135public struct EntityProperties 136public struct EntityProperties
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs b/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
index 34fd2a0..35dba9b 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
@@ -557,8 +557,9 @@ public sealed class BSScene : PhysicsScene, IPhysicsParameters
557 uint cB = m_collisionArray[ii].bID; 557 uint cB = m_collisionArray[ii].bID;
558 Vector3 point = m_collisionArray[ii].point; 558 Vector3 point = m_collisionArray[ii].point;
559 Vector3 normal = m_collisionArray[ii].normal; 559 Vector3 normal = m_collisionArray[ii].normal;
560 SendCollision(cA, cB, point, normal, 0.01f); 560 float penetration = m_collisionArray[ii].penetration;
561 SendCollision(cB, cA, point, -normal, 0.01f); 561 SendCollision(cA, cB, point, normal, penetration);
562 SendCollision(cB, cA, point, -normal, penetration);
562 } 563 }
563 } 564 }
564 565
diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
index 891e453..c8ced43 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
@@ -307,6 +307,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
307 null, 307 null,
308 constructorParams, 308 constructorParams,
309 null, 309 null,
310 null,
310 null); 311 null);
311 else 312 else
312 m_Script 313 m_Script
diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/Tests/CoopTerminationTests.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/Tests/CoopTerminationTests.cs
index 52d75a0..3b13386 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Instance/Tests/CoopTerminationTests.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Instance/Tests/CoopTerminationTests.cs
@@ -264,7 +264,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance.Tests
264 TestStop(script); 264 TestStop(script);
265 } 265 }
266 266
267 [Test] 267 // Disabling for now as these are not particularly useful tests (since they fail due to stack overflow before
268 // termination can even be tried.
269// [Test]
268 public void TestStopOnInfiniteUserFunctionCallLoop() 270 public void TestStopOnInfiniteUserFunctionCallLoop()
269 { 271 {
270 TestHelpers.InMethod(); 272 TestHelpers.InMethod();
@@ -294,7 +296,9 @@ default
294 TestStop(script); 296 TestStop(script);
295 } 297 }
296 298
297 [Test] 299 // Disabling for now as these are not particularly useful tests (since they fail due to stack overflow before
300 // termination can even be tried.
301// [Test]
298 public void TestStopOnInfiniteManualEventCallLoop() 302 public void TestStopOnInfiniteManualEventCallLoop()
299 { 303 {
300 TestHelpers.InMethod(); 304 TestHelpers.InMethod();