aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/Manager
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2013-01-15 00:24:51 +0000
committerJustin Clark-Casey (justincc)2013-01-15 00:24:51 +0000
commitc846cefda97bd59b7707147d7ae1a520c9121127 (patch)
treeee23e4b451087874a8149348e010a905817121f7 /OpenSim/Region/Physics/Manager
parentrefactor: Simplify ScriptInstance by retaining reference to SceneObjectPart i... (diff)
parentBulletSim: fix not moving physical objects below terrain to over terrain. (diff)
downloadopensim-SC-c846cefda97bd59b7707147d7ae1a520c9121127.zip
opensim-SC-c846cefda97bd59b7707147d7ae1a520c9121127.tar.gz
opensim-SC-c846cefda97bd59b7707147d7ae1a520c9121127.tar.bz2
opensim-SC-c846cefda97bd59b7707147d7ae1a520c9121127.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Physics/Manager/PhysicsScene.cs11
1 files changed, 9 insertions, 2 deletions
diff --git a/OpenSim/Region/Physics/Manager/PhysicsScene.cs b/OpenSim/Region/Physics/Manager/PhysicsScene.cs
index 488900e..201007b 100644
--- a/OpenSim/Region/Physics/Manager/PhysicsScene.cs
+++ b/OpenSim/Region/Physics/Manager/PhysicsScene.cs
@@ -62,13 +62,20 @@ namespace OpenSim.Region.Physics.Manager
62// private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 62// private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
63 63
64 /// <summary> 64 /// <summary>
65 /// Name of this scene. Useful in debug messages to distinguish one OdeScene instance from another. 65 /// A unique identifying string for this instance of the physics engine.
66 /// Useful in debug messages to distinguish one OdeScene instance from another.
67 /// Usually set to include the region name that the physics engine is acting for.
66 /// </summary> 68 /// </summary>
67 public string Name { get; protected set; } 69 public string Name { get; protected set; }
68 70
71 /// <summary>
72 /// A string identifying the family of this physics engine. Most common values returned
73 /// are "OpenDynamicsEngine" and "BulletSim" but others are possible.
74 /// </summary>
75 public string EngineType { get; protected set; }
76
69 // The only thing that should register for this event is the SceneGraph 77 // The only thing that should register for this event is the SceneGraph
70 // Anything else could cause problems. 78 // Anything else could cause problems.
71
72 public event physicsCrash OnPhysicsCrash; 79 public event physicsCrash OnPhysicsCrash;
73 80
74 public static PhysicsScene Null 81 public static PhysicsScene Null