diff options
| author | Mic Bowman | 2011-08-05 11:13:02 -0700 |
|---|---|---|
| committer | Mic Bowman | 2011-08-05 11:13:02 -0700 |
| commit | c3f579046c4de7a5a65e71e4c02958425fd7998a (patch) | |
| tree | b725d9eaa66d5eb7cf1f87ddbb4fa0f4284f71f5 /OpenSim/Region/Physics/Manager | |
| parent | BulletSim: Parameters settable from ini file. Linksets. Physical property val... (diff) | |
| parent | remove the largely unused copy/pasted HandleAgentRequestSit() method (diff) | |
| download | opensim-SC_OLD-c3f579046c4de7a5a65e71e4c02958425fd7998a.zip opensim-SC_OLD-c3f579046c4de7a5a65e71e4c02958425fd7998a.tar.gz opensim-SC_OLD-c3f579046c4de7a5a65e71e4c02958425fd7998a.tar.bz2 opensim-SC_OLD-c3f579046c4de7a5a65e71e4c02958425fd7998a.tar.xz | |
Merge branch 'master' into bulletsim
Diffstat (limited to 'OpenSim/Region/Physics/Manager')
| -rw-r--r-- | OpenSim/Region/Physics/Manager/PhysicsScene.cs | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/OpenSim/Region/Physics/Manager/PhysicsScene.cs b/OpenSim/Region/Physics/Manager/PhysicsScene.cs index 3870411..04efc1d 100644 --- a/OpenSim/Region/Physics/Manager/PhysicsScene.cs +++ b/OpenSim/Region/Physics/Manager/PhysicsScene.cs | |||
| @@ -86,6 +86,10 @@ namespace OpenSim.Region.Physics.Manager | |||
| 86 | 86 | ||
| 87 | public abstract void RemoveAvatar(PhysicsActor actor); | 87 | public abstract void RemoveAvatar(PhysicsActor actor); |
| 88 | 88 | ||
| 89 | /// <summary> | ||
| 90 | /// Remove a prim from the physics scene. | ||
| 91 | /// </summary> | ||
| 92 | /// <param name="prim"></param> | ||
| 89 | public abstract void RemovePrim(PhysicsActor prim); | 93 | public abstract void RemovePrim(PhysicsActor prim); |
| 90 | 94 | ||
| 91 | public abstract PhysicsActor AddPrimShape(string primName, PrimitiveBaseShape pbs, Vector3 position, | 95 | public abstract PhysicsActor AddPrimShape(string primName, PrimitiveBaseShape pbs, Vector3 position, |