aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorRobert Adams2013-07-23 08:12:34 -0700
committerRobert Adams2013-07-23 08:12:34 -0700
commit401c2e2f2ec7c6001387df505665b19477afd4cf (patch)
tree71c5a232aae13380c8d66a985ff533eda40b79b8 /OpenSim
parentRevert "Revert "BulletSim: freshen up the code for constraint based linksets."" (diff)
downloadopensim-SC_OLD-401c2e2f2ec7c6001387df505665b19477afd4cf.zip
opensim-SC_OLD-401c2e2f2ec7c6001387df505665b19477afd4cf.tar.gz
opensim-SC_OLD-401c2e2f2ec7c6001387df505665b19477afd4cf.tar.bz2
opensim-SC_OLD-401c2e2f2ec7c6001387df505665b19477afd4cf.tar.xz
Revert "Revert "Add experimental stubs for an extension function interface on both""
Found that the vehicle movement problem was not caused by these physics changes. This reverts commit 89857378ce79f93a265bc1eb151e17742032abfa.
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/Physics/Manager/PhysicsActor.cs6
-rw-r--r--OpenSim/Region/Physics/Manager/PhysicsScene.cs9
2 files changed, 15 insertions, 0 deletions
diff --git a/OpenSim/Region/Physics/Manager/PhysicsActor.cs b/OpenSim/Region/Physics/Manager/PhysicsActor.cs
index bd806eb..2500f27 100644
--- a/OpenSim/Region/Physics/Manager/PhysicsActor.cs
+++ b/OpenSim/Region/Physics/Manager/PhysicsActor.cs
@@ -313,6 +313,12 @@ namespace OpenSim.Region.Physics.Manager
313 public abstract void SubscribeEvents(int ms); 313 public abstract void SubscribeEvents(int ms);
314 public abstract void UnSubscribeEvents(); 314 public abstract void UnSubscribeEvents();
315 public abstract bool SubscribedEvents(); 315 public abstract bool SubscribedEvents();
316
317 // Extendable interface for new, physics engine specific operations
318 public virtual object Extension(string pFunct, params object[] pParams)
319 {
320 throw new NotImplementedException();
321 }
316 } 322 }
317 323
318 public class NullPhysicsActor : PhysicsActor 324 public class NullPhysicsActor : PhysicsActor
diff --git a/OpenSim/Region/Physics/Manager/PhysicsScene.cs b/OpenSim/Region/Physics/Manager/PhysicsScene.cs
index 290b72e..07a1d36 100644
--- a/OpenSim/Region/Physics/Manager/PhysicsScene.cs
+++ b/OpenSim/Region/Physics/Manager/PhysicsScene.cs
@@ -25,10 +25,13 @@
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28using System;
28using System.Collections.Generic; 29using System.Collections.Generic;
29using System.Reflection; 30using System.Reflection;
31
30using log4net; 32using log4net;
31using Nini.Config; 33using Nini.Config;
34
32using OpenSim.Framework; 35using OpenSim.Framework;
33using OpenMetaverse; 36using OpenMetaverse;
34 37
@@ -331,5 +334,11 @@ namespace OpenSim.Region.Physics.Manager
331 { 334 {
332 return false; 335 return false;
333 } 336 }
337
338 // Extendable interface for new, physics engine specific operations
339 public virtual object Extension(string pFunct, params object[] pParams)
340 {
341 throw new NotImplementedException();
342 }
334 } 343 }
335} 344}