diff options
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs b/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs index 8878820..15eb01f 100644 --- a/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs +++ b/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs | |||
@@ -1251,13 +1251,13 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
1251 | 1251 | ||
1252 | #region Add/Remove Entities | 1252 | #region Add/Remove Entities |
1253 | 1253 | ||
1254 | public override PhysicsActor AddAvatar(string avName, Vector3 position, Vector3 size, float feetOffset, bool isFlying) | 1254 | public override PhysicsActor AddAvatar(uint localID, string avName, Vector3 position, Vector3 size, float feetOffset, bool isFlying) |
1255 | { | 1255 | { |
1256 | Vector3 pos; | 1256 | Vector3 pos; |
1257 | pos.X = position.X; | 1257 | pos.X = position.X; |
1258 | pos.Y = position.Y; | 1258 | pos.Y = position.Y; |
1259 | pos.Z = position.Z; | 1259 | pos.Z = position.Z; |
1260 | OdeCharacter newAv = new OdeCharacter(avName, this, pos, size, feetOffset, avDensity, avMovementDivisorWalk, avMovementDivisorRun); | 1260 | OdeCharacter newAv = new OdeCharacter(localID,avName, this, pos, size, feetOffset, avDensity, avMovementDivisorWalk, avMovementDivisorRun); |
1261 | newAv.Flying = isFlying; | 1261 | newAv.Flying = isFlying; |
1262 | newAv.MinimumGroundFlightOffset = minimumGroundFlightOffset; | 1262 | newAv.MinimumGroundFlightOffset = minimumGroundFlightOffset; |
1263 | 1263 | ||