diff options
author | UbitUmarov | 2012-12-11 17:14:32 +0000 |
---|---|---|
committer | UbitUmarov | 2012-12-11 17:14:32 +0000 |
commit | 28ea08c3e234f8ca3c6590af4045349af7fed844 (patch) | |
tree | 744b0040d1aa64fea05cfa5513a0d4f50f059fea /OpenSim/Region/Physics/Manager/PhysicsScene.cs | |
parent | missing files remove some warnings... (diff) | |
download | opensim-SC_OLD-28ea08c3e234f8ca3c6590af4045349af7fed844.zip opensim-SC_OLD-28ea08c3e234f8ca3c6590af4045349af7fed844.tar.gz opensim-SC_OLD-28ea08c3e234f8ca3c6590af4045349af7fed844.tar.bz2 opensim-SC_OLD-28ea08c3e234f8ca3c6590af4045349af7fed844.tar.xz |
fix let other phys plugins work.. broken when added feetOffset
Diffstat (limited to 'OpenSim/Region/Physics/Manager/PhysicsScene.cs')
-rw-r--r-- | OpenSim/Region/Physics/Manager/PhysicsScene.cs | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/OpenSim/Region/Physics/Manager/PhysicsScene.cs b/OpenSim/Region/Physics/Manager/PhysicsScene.cs index c07213e..cdffa6b 100644 --- a/OpenSim/Region/Physics/Manager/PhysicsScene.cs +++ b/OpenSim/Region/Physics/Manager/PhysicsScene.cs | |||
@@ -147,15 +147,9 @@ namespace OpenSim.Region.Physics.Manager | |||
147 | return ret; | 147 | return ret; |
148 | } | 148 | } |
149 | 149 | ||
150 | public virtual PhysicsActor AddAvatar(string avName, Vector3 position, Vector3 size,float feetOffset, bool isFlying) | 150 | public virtual PhysicsActor AddAvatar(uint localID, string avName, Vector3 position, Vector3 size, float feetOffset, bool isFlying) |
151 | { | 151 | { |
152 | return null; | 152 | PhysicsActor ret = AddAvatar(localID, avName, position, size, isFlying); |
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; | 153 | return ret; |
160 | } | 154 | } |
161 | 155 | ||