diff options
author | UbitUmarov | 2015-09-02 19:54:53 +0100 |
---|---|---|
committer | UbitUmarov | 2015-09-02 19:54:53 +0100 |
commit | a11edceb00b5b86f825bd957bdac9edb91f893dd (patch) | |
tree | c192eae26f3aadf365a66f32fc6d9ade2f0a0c61 /OpenSim/Region/Physics/Manager/PhysicsScene.cs | |
parent | bad merge? (diff) | |
download | opensim-SC_OLD-a11edceb00b5b86f825bd957bdac9edb91f893dd.zip opensim-SC_OLD-a11edceb00b5b86f825bd957bdac9edb91f893dd.tar.gz opensim-SC_OLD-a11edceb00b5b86f825bd957bdac9edb91f893dd.tar.bz2 opensim-SC_OLD-a11edceb00b5b86f825bd957bdac9edb91f893dd.tar.xz |
seems to compile ( tests comented out)
Diffstat (limited to 'OpenSim/Region/Physics/Manager/PhysicsScene.cs')
-rw-r--r-- | OpenSim/Region/Physics/Manager/PhysicsScene.cs | 22 |
1 files changed, 17 insertions, 5 deletions
diff --git a/OpenSim/Region/Physics/Manager/PhysicsScene.cs b/OpenSim/Region/Physics/Manager/PhysicsScene.cs index 96ef0a6..eb7e8fc 100644 --- a/OpenSim/Region/Physics/Manager/PhysicsScene.cs +++ b/OpenSim/Region/Physics/Manager/PhysicsScene.cs | |||
@@ -152,16 +152,16 @@ namespace OpenSim.Region.Physics.Manager | |||
152 | /// <param name="size"></param> | 152 | /// <param name="size"></param> |
153 | /// <param name="isFlying"></param> | 153 | /// <param name="isFlying"></param> |
154 | /// <returns></returns> | 154 | /// <returns></returns> |
155 | <<<<<<< HEAD | 155 | |
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 | ======= | 159 | |
160 | public virtual PhysicsActor AddAvatar(string avName, Vector3 position, Vector3 size, bool isFlying) | 160 | public virtual PhysicsActor AddAvatar(string avName, Vector3 position, Vector3 size, bool isFlying) |
161 | { | 161 | { |
162 | return null; | 162 | return null; |
163 | } | 163 | } |
164 | >>>>>>> avn/ubitvar | 164 | |
165 | /// <summary> | 165 | /// <summary> |
166 | /// Add an avatar | 166 | /// Add an avatar |
167 | /// </summary> | 167 | /// </summary> |
@@ -177,13 +177,25 @@ namespace OpenSim.Region.Physics.Manager | |||
177 | { | 177 | { |
178 | PhysicsActor ret = AddAvatar(avName, position, velocity, size, isFlying); | 178 | PhysicsActor ret = AddAvatar(avName, position, velocity, size, isFlying); |
179 | 179 | ||
180 | if (ret != null) | 180 | if (ret != null) |
181 | ret.LocalID = localID; | ||
182 | |||
183 | return ret; | ||
184 | } | ||
185 | |||
186 | public virtual PhysicsActor AddAvatar( | ||
187 | uint localID, string avName, Vector3 position, Vector3 size, bool isFlying) | ||
188 | { | ||
189 | PhysicsActor ret = AddAvatar(avName, position, size, isFlying); | ||
190 | |||
191 | if (ret != null) | ||
181 | ret.LocalID = localID; | 192 | ret.LocalID = localID; |
182 | 193 | ||
183 | return ret; | 194 | return ret; |
184 | } | 195 | } |
185 | 196 | ||
186 | public virtual PhysicsActor AddAvatar(uint localID, string avName, Vector3 position, Vector3 size, float feetOffset, bool isFlying) | 197 | public virtual PhysicsActor AddAvatar( |
198 | uint localID, string avName, Vector3 position, Vector3 size, float feetOffset, bool isFlying) | ||
187 | { | 199 | { |
188 | PhysicsActor ret = AddAvatar(localID, avName, position, size, isFlying); | 200 | PhysicsActor ret = AddAvatar(localID, avName, position, size, isFlying); |
189 | return ret; | 201 | return ret; |