diff options
Merge commit '227db07f2ff8a1ba840a0d3018bb242a34d6038f' into bigmerge
Diffstat (limited to 'OpenSim/Region/Physics/Manager/PhysicsScene.cs')
-rw-r--r-- | OpenSim/Region/Physics/Manager/PhysicsScene.cs | 23 |
1 files changed, 22 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/Manager/PhysicsScene.cs b/OpenSim/Region/Physics/Manager/PhysicsScene.cs index 72b01ac..2f59434 100644 --- a/OpenSim/Region/Physics/Manager/PhysicsScene.cs +++ b/OpenSim/Region/Physics/Manager/PhysicsScene.cs | |||
@@ -75,8 +75,25 @@ namespace OpenSim.Region.Physics.Manager | |||
75 | 75 | ||
76 | public abstract void Initialise(IMesher meshmerizer, IConfigSource config); | 76 | public abstract void Initialise(IMesher meshmerizer, IConfigSource config); |
77 | 77 | ||
78 | /// <summary> | ||
79 | /// Add an avatar | ||
80 | /// </summary> | ||
81 | /// <param name="avName"></param> | ||
82 | /// <param name="position"></param> | ||
83 | /// <param name="size"></param> | ||
84 | /// <param name="isFlying"></param> | ||
85 | /// <returns></returns> | ||
78 | public abstract PhysicsActor AddAvatar(string avName, Vector3 position, Vector3 size, bool isFlying); | 86 | public abstract PhysicsActor AddAvatar(string avName, Vector3 position, Vector3 size, bool isFlying); |
79 | 87 | ||
88 | /// <summary> | ||
89 | /// Add an avatar | ||
90 | /// </summary> | ||
91 | /// <param name="localID"></param> | ||
92 | /// <param name="avName"></param> | ||
93 | /// <param name="position"></param> | ||
94 | /// <param name="size"></param> | ||
95 | /// <param name="isFlying"></param> | ||
96 | /// <returns></returns> | ||
80 | public virtual PhysicsActor AddAvatar(uint localID, string avName, Vector3 position, Vector3 size, bool isFlying) | 97 | public virtual PhysicsActor AddAvatar(uint localID, string avName, Vector3 position, Vector3 size, bool isFlying) |
81 | { | 98 | { |
82 | PhysicsActor ret = AddAvatar(avName, position, size, isFlying); | 99 | PhysicsActor ret = AddAvatar(avName, position, size, isFlying); |
@@ -84,10 +101,14 @@ namespace OpenSim.Region.Physics.Manager | |||
84 | return ret; | 101 | return ret; |
85 | } | 102 | } |
86 | 103 | ||
104 | /// <summary> | ||
105 | /// Remove an avatar. | ||
106 | /// </summary> | ||
107 | /// <param name="actor"></param> | ||
87 | public abstract void RemoveAvatar(PhysicsActor actor); | 108 | public abstract void RemoveAvatar(PhysicsActor actor); |
88 | 109 | ||
89 | /// <summary> | 110 | /// <summary> |
90 | /// Remove a prim from the physics scene. | 111 | /// Remove a prim. |
91 | /// </summary> | 112 | /// </summary> |
92 | /// <param name="prim"></param> | 113 | /// <param name="prim"></param> |
93 | public abstract void RemovePrim(PhysicsActor prim); | 114 | public abstract void RemovePrim(PhysicsActor prim); |