aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2013-08-02 23:16:41 +0100
committerJustin Clark-Casey (justincc)2013-08-02 23:17:20 +0100
commit4ff3757f86dc8727a861d43b639d9b2341be9108 (patch)
tree00730c20dd9f5f2dc7bf12379425701bc3dcdfd1 /OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
parentAllow older teleport ConnectorProtocolVersion of "SIMULATION/0.1" to be manua... (diff)
parentBulletSim: When converting linkset types, don't try to change the list (diff)
downloadopensim-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/BulletSPlugin/BSScene.cs')
-rw-r--r--OpenSim/Region/Physics/BulletSPlugin/BSScene.cs17
1 files changed, 17 insertions, 0 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs b/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
index 41aca3b..79ac5a5 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
@@ -862,6 +862,23 @@ public sealed class BSScene : PhysicsScene, IPhysicsParameters
862 862
863 public override bool IsThreaded { get { return false; } } 863 public override bool IsThreaded { get { return false; } }
864 864
865 #region Extensions
866 // =============================================================
867 // Per scene functions. See below.
868
869 // Per avatar functions. See BSCharacter.
870
871 // Per prim functions. See BSPrim.
872 public const string PhysFunctGetLinksetType = "BulletSim.GetLinksetType";
873 public const string PhysFunctSetLinksetType = "BulletSim.SetLinksetType";
874 // =============================================================
875
876 public override object Extension(string pFunct, params object[] pParams)
877 {
878 return base.Extension(pFunct, pParams);
879 }
880 #endregion // Extensions
881
865 #region Taints 882 #region Taints
866 // The simulation execution order is: 883 // The simulation execution order is:
867 // Simulate() 884 // Simulate()