aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/Manager
diff options
context:
space:
mode:
authorUbitUmarov2012-12-07 20:06:35 +0000
committerUbitUmarov2012-12-07 20:06:35 +0000
commit2ea0dc55d7ea6da6e91ab614856cdeece7eae5d2 (patch)
treeb206c3b95b118718a62d8e1a8b81347e50a0ea80 /OpenSim/Region/Physics/Manager
parentcalculate avatar size on tps (diff)
downloadopensim-SC_OLD-2ea0dc55d7ea6da6e91ab614856cdeece7eae5d2.zip
opensim-SC_OLD-2ea0dc55d7ea6da6e91ab614856cdeece7eae5d2.tar.gz
opensim-SC_OLD-2ea0dc55d7ea6da6e91ab614856cdeece7eae5d2.tar.bz2
opensim-SC_OLD-2ea0dc55d7ea6da6e91ab614856cdeece7eae5d2.tar.xz
create a new ode character also with the new information
Diffstat (limited to 'OpenSim/Region/Physics/Manager')
-rw-r--r--OpenSim/Region/Physics/Manager/PhysicsScene.cs18
1 files changed, 16 insertions, 2 deletions
diff --git a/OpenSim/Region/Physics/Manager/PhysicsScene.cs b/OpenSim/Region/Physics/Manager/PhysicsScene.cs
index ce269fa..c07213e 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,18 @@ namespace OpenSim.Region.Physics.Manager
145 return ret; 147 return ret;
146 } 148 }
147 149
150 public virtual PhysicsActor AddAvatar(string avName, Vector3 position, Vector3 size,float feetOffset, bool isFlying)
151 {
152 return null;
153 }
154
155 public virtual PhysicsActor AddAvatar(uint localID,string avName, Vector3 position, Vector3 size, float feetOffset, bool isFlying)
156 {
157 PhysicsActor ret = AddAvatar(avName, position, size,feetOffset, isFlying);
158 if (ret != null) ret.LocalID = localID;
159 return ret;
160 }
161
148 /// <summary> 162 /// <summary>
149 /// Remove an avatar. 163 /// Remove an avatar.
150 /// </summary> 164 /// </summary>