aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorRobert Adams2013-07-22 12:09:55 -0700
committerRobert Adams2013-07-22 12:09:55 -0700
commit89857378ce79f93a265bc1eb151e17742032abfa (patch)
tree0000feec9e36793838c87d314ce875ebedfbbb5b /OpenSim
parentRevert "BulletSim: move collision processing for linksets from BSPrimLinkable" (diff)
downloadopensim-SC_OLD-89857378ce79f93a265bc1eb151e17742032abfa.zip
opensim-SC_OLD-89857378ce79f93a265bc1eb151e17742032abfa.tar.gz
opensim-SC_OLD-89857378ce79f93a265bc1eb151e17742032abfa.tar.bz2
opensim-SC_OLD-89857378ce79f93a265bc1eb151e17742032abfa.tar.xz
Revert "Add experimental stubs for an extension function interface on both"
The changes don't seem to be ready for prime time. This reverts commit 13a4a80b3893af13ab748c177b731fed813974ca.
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, 0 insertions, 15 deletions
diff --git a/OpenSim/Region/Physics/Manager/PhysicsActor.cs b/OpenSim/Region/Physics/Manager/PhysicsActor.cs
index 2500f27..bd806eb 100644
--- a/OpenSim/Region/Physics/Manager/PhysicsActor.cs
+++ b/OpenSim/Region/Physics/Manager/PhysicsActor.cs
@@ -313,12 +313,6 @@ 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 }
322 } 316 }
323 317
324 public class NullPhysicsActor : PhysicsActor 318 public class NullPhysicsActor : PhysicsActor
diff --git a/OpenSim/Region/Physics/Manager/PhysicsScene.cs b/OpenSim/Region/Physics/Manager/PhysicsScene.cs
index 07a1d36..290b72e 100644
--- a/OpenSim/Region/Physics/Manager/PhysicsScene.cs
+++ b/OpenSim/Region/Physics/Manager/PhysicsScene.cs
@@ -25,13 +25,10 @@
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;
29using System.Collections.Generic; 28using System.Collections.Generic;
30using System.Reflection; 29using System.Reflection;
31
32using log4net; 30using log4net;
33using Nini.Config; 31using Nini.Config;
34
35using OpenSim.Framework; 32using OpenSim.Framework;
36using OpenMetaverse; 33using OpenMetaverse;
37 34
@@ -334,11 +331,5 @@ namespace OpenSim.Region.Physics.Manager
334 { 331 {
335 return false; 332 return false;
336 } 333 }
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 }
343 } 334 }
344} 335}