diff options
| author | Justin Clark-Casey (justincc) | 2013-08-02 23:16:41 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2013-08-02 23:17:20 +0100 |
| commit | 4ff3757f86dc8727a861d43b639d9b2341be9108 (patch) | |
| tree | 00730c20dd9f5f2dc7bf12379425701bc3dcdfd1 /OpenSim/Region/Physics/Manager/PhysicsActor.cs | |
| parent | Allow older teleport ConnectorProtocolVersion of "SIMULATION/0.1" to be manua... (diff) | |
| parent | BulletSim: When converting linkset types, don't try to change the list (diff) | |
| download | opensim-SC-4ff3757f86dc8727a861d43b639d9b2341be9108.zip opensim-SC-4ff3757f86dc8727a861d43b639d9b2341be9108.tar.gz opensim-SC-4ff3757f86dc8727a861d43b639d9b2341be9108.tar.bz2 opensim-SC-4ff3757f86dc8727a861d43b639d9b2341be9108.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Physics/Manager/PhysicsActor.cs')
| -rw-r--r-- | OpenSim/Region/Physics/Manager/PhysicsActor.cs | 3 |
1 files changed, 2 insertions, 1 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 | ||