diff options
author | Robert Adams | 2013-07-23 08:12:34 -0700 |
---|---|---|
committer | Robert Adams | 2013-07-23 08:12:34 -0700 |
commit | 401c2e2f2ec7c6001387df505665b19477afd4cf (patch) | |
tree | 71c5a232aae13380c8d66a985ff533eda40b79b8 /OpenSim | |
parent | Revert "Revert "BulletSim: freshen up the code for constraint based linksets."" (diff) | |
download | opensim-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.cs | 6 | ||||
-rw-r--r-- | OpenSim/Region/Physics/Manager/PhysicsScene.cs | 9 |
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 | ||
28 | using System; | ||
28 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
29 | using System.Reflection; | 30 | using System.Reflection; |
31 | |||
30 | using log4net; | 32 | using log4net; |
31 | using Nini.Config; | 33 | using Nini.Config; |
34 | |||
32 | using OpenSim.Framework; | 35 | using OpenSim.Framework; |
33 | using OpenMetaverse; | 36 | using 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 | } |