diff options
author | Robert Adams | 2013-08-01 17:43:06 -0700 |
---|---|---|
committer | Robert Adams | 2013-08-02 09:47:12 -0700 |
commit | 24df15dab7befd50f7a45eb54f001e6e481f0ec4 (patch) | |
tree | f3502a9782d68848c00fe3cb9b4b2a04dfa91f61 /OpenSim/Region/Physics/Manager | |
parent | BulletSim: add BSLinkInfo structure to remember link specific information (diff) | |
download | opensim-SC_OLD-24df15dab7befd50f7a45eb54f001e6e481f0ec4.zip opensim-SC_OLD-24df15dab7befd50f7a45eb54f001e6e481f0ec4.tar.gz opensim-SC_OLD-24df15dab7befd50f7a45eb54f001e6e481f0ec4.tar.bz2 opensim-SC_OLD-24df15dab7befd50f7a45eb54f001e6e481f0ec4.tar.xz |
BulletSim: add implementation of 'physSetLinksetType' and 'physGetLinksetType'
and processing routines in BulletSim.
Add linkset rebuild/conversion routine in BSLinkset.
Diffstat (limited to 'OpenSim/Region/Physics/Manager')
-rw-r--r-- | OpenSim/Region/Physics/Manager/PhysicsActor.cs | 3 | ||||
-rw-r--r-- | OpenSim/Region/Physics/Manager/PhysicsScene.cs | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/OpenSim/Region/Physics/Manager/PhysicsActor.cs b/OpenSim/Region/Physics/Manager/PhysicsActor.cs index 2500f27..1750853 100644 --- a/OpenSim/Region/Physics/Manager/PhysicsActor.cs +++ b/OpenSim/Region/Physics/Manager/PhysicsActor.cs | |||
@@ -317,7 +317,8 @@ namespace OpenSim.Region.Physics.Manager | |||
317 | // Extendable interface for new, physics engine specific operations | 317 | // Extendable interface for new, physics engine specific operations |
318 | public virtual object Extension(string pFunct, params object[] pParams) | 318 | public virtual object Extension(string pFunct, params object[] pParams) |
319 | { | 319 | { |
320 | throw new NotImplementedException(); | 320 | // A NOP of the physics engine does not implement this feature |
321 | return null; | ||
321 | } | 322 | } |
322 | } | 323 | } |
323 | 324 | ||
diff --git a/OpenSim/Region/Physics/Manager/PhysicsScene.cs b/OpenSim/Region/Physics/Manager/PhysicsScene.cs index 07a1d36..c93206d 100644 --- a/OpenSim/Region/Physics/Manager/PhysicsScene.cs +++ b/OpenSim/Region/Physics/Manager/PhysicsScene.cs | |||
@@ -338,7 +338,8 @@ namespace OpenSim.Region.Physics.Manager | |||
338 | // Extendable interface for new, physics engine specific operations | 338 | // Extendable interface for new, physics engine specific operations |
339 | public virtual object Extension(string pFunct, params object[] pParams) | 339 | public virtual object Extension(string pFunct, params object[] pParams) |
340 | { | 340 | { |
341 | throw new NotImplementedException(); | 341 | // A NOP if the extension thing is not implemented by the physics engine |
342 | return null; | ||
342 | } | 343 | } |
343 | } | 344 | } |
344 | } | 345 | } |