aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/Manager
diff options
context:
space:
mode:
authorUbitUmarov2015-09-03 22:09:27 +0100
committerUbitUmarov2015-09-03 22:09:27 +0100
commit2f9a018bc8d6fbcc07387c08bef330df8e9e69da (patch)
treea8386ec6a270f18b8c4bb856f27effab422fd6d6 /OpenSim/Region/Physics/Manager
parentfix a old bug i added: MaxWearables can't be changed in runtime (diff)
downloadopensim-SC-2f9a018bc8d6fbcc07387c08bef330df8e9e69da.zip
opensim-SC-2f9a018bc8d6fbcc07387c08bef330df8e9e69da.tar.gz
opensim-SC-2f9a018bc8d6fbcc07387c08bef330df8e9e69da.tar.bz2
opensim-SC-2f9a018bc8d6fbcc07387c08bef330df8e9e69da.tar.xz
make addavatar more friendly between plugins
Diffstat (limited to 'OpenSim/Region/Physics/Manager')
-rw-r--r--OpenSim/Region/Physics/Manager/PhysicsScene.cs10
1 files changed, 2 insertions, 8 deletions
diff --git a/OpenSim/Region/Physics/Manager/PhysicsScene.cs b/OpenSim/Region/Physics/Manager/PhysicsScene.cs
index eb7e8fc..1bab7e1 100644
--- a/OpenSim/Region/Physics/Manager/PhysicsScene.cs
+++ b/OpenSim/Region/Physics/Manager/PhysicsScene.cs
@@ -156,12 +156,6 @@ namespace OpenSim.Region.Physics.Manager
156 public abstract PhysicsActor AddAvatar( 156 public abstract PhysicsActor AddAvatar(
157 string avName, Vector3 position, Vector3 velocity, Vector3 size, bool isFlying); 157 string avName, Vector3 position, Vector3 velocity, Vector3 size, bool isFlying);
158 158
159
160 public virtual PhysicsActor AddAvatar(string avName, Vector3 position, Vector3 size, bool isFlying)
161 {
162 return null;
163 }
164
165 /// <summary> 159 /// <summary>
166 /// Add an avatar 160 /// Add an avatar
167 /// </summary> 161 /// </summary>
@@ -186,7 +180,7 @@ namespace OpenSim.Region.Physics.Manager
186 public virtual PhysicsActor AddAvatar( 180 public virtual PhysicsActor AddAvatar(
187 uint localID, string avName, Vector3 position, Vector3 size, bool isFlying) 181 uint localID, string avName, Vector3 position, Vector3 size, bool isFlying)
188 { 182 {
189 PhysicsActor ret = AddAvatar(avName, position, size, isFlying); 183 PhysicsActor ret = AddAvatar(avName, position, Vector3.Zero, size, isFlying);
190 184
191 if (ret != null) 185 if (ret != null)
192 ret.LocalID = localID; 186 ret.LocalID = localID;
@@ -197,7 +191,7 @@ namespace OpenSim.Region.Physics.Manager
197 public virtual PhysicsActor AddAvatar( 191 public virtual PhysicsActor AddAvatar(
198 uint localID, string avName, Vector3 position, Vector3 size, float feetOffset, bool isFlying) 192 uint localID, string avName, Vector3 position, Vector3 size, float feetOffset, bool isFlying)
199 { 193 {
200 PhysicsActor ret = AddAvatar(localID, avName, position, size, isFlying); 194 PhysicsActor ret = AddAvatar(localID, avName, position, Vector3.Zero, size, isFlying);
201 return ret; 195 return ret;
202 } 196 }
203 197