diff options
author | Melanie | 2012-12-14 03:57:31 +0100 |
---|---|---|
committer | Melanie | 2012-12-14 03:57:31 +0100 |
commit | 1d713bcdb8f63bc8c83a06acc90c2adf5d0d8992 (patch) | |
tree | 1e61c0c72389710bdf48875d38624ee1411a4f08 /OpenSim/Region/Physics/Manager/PhysicsScene.cs | |
parent | Prevent a failed user relogi from throwing exceptions in poll services (diff) | |
parent | right fix this time ?? (diff) | |
download | opensim-SC-1d713bcdb8f63bc8c83a06acc90c2adf5d0d8992.zip opensim-SC-1d713bcdb8f63bc8c83a06acc90c2adf5d0d8992.tar.gz opensim-SC-1d713bcdb8f63bc8c83a06acc90c2adf5d0d8992.tar.bz2 opensim-SC-1d713bcdb8f63bc8c83a06acc90c2adf5d0d8992.tar.xz |
Merge branch 'ubitwork' into avination
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Physics/Manager/PhysicsScene.cs | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/OpenSim/Region/Physics/Manager/PhysicsScene.cs b/OpenSim/Region/Physics/Manager/PhysicsScene.cs index ce269fa..cdffa6b 100644 --- a/OpenSim/Region/Physics/Manager/PhysicsScene.cs +++ b/OpenSim/Region/Physics/Manager/PhysicsScene.cs | |||
@@ -127,8 +127,10 @@ namespace OpenSim.Region.Physics.Manager | |||
127 | /// <param name="size"></param> | 127 | /// <param name="size"></param> |
128 | /// <param name="isFlying"></param> | 128 | /// <param name="isFlying"></param> |
129 | /// <returns></returns> | 129 | /// <returns></returns> |
130 | public abstract PhysicsActor AddAvatar(string avName, Vector3 position, Vector3 size, bool isFlying); | 130 | public virtual PhysicsActor AddAvatar(string avName, Vector3 position, Vector3 size, bool isFlying) |
131 | 131 | { | |
132 | return null; | ||
133 | } | ||
132 | /// <summary> | 134 | /// <summary> |
133 | /// Add an avatar | 135 | /// Add an avatar |
134 | /// </summary> | 136 | /// </summary> |
@@ -145,6 +147,12 @@ namespace OpenSim.Region.Physics.Manager | |||
145 | return ret; | 147 | return ret; |
146 | } | 148 | } |
147 | 149 | ||
150 | public virtual PhysicsActor AddAvatar(uint localID, string avName, Vector3 position, Vector3 size, float feetOffset, bool isFlying) | ||
151 | { | ||
152 | PhysicsActor ret = AddAvatar(localID, avName, position, size, isFlying); | ||
153 | return ret; | ||
154 | } | ||
155 | |||
148 | /// <summary> | 156 | /// <summary> |
149 | /// Remove an avatar. | 157 | /// Remove an avatar. |
150 | /// </summary> | 158 | /// </summary> |