aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs
diff options
context:
space:
mode:
authorubit2012-12-07 21:07:27 +0100
committerubit2012-12-07 21:07:27 +0100
commit926db81c5713e3e57b8f5d97ad7ebe7ea25784f3 (patch)
tree01611d4e7450954fbfb192989b064f3166a5b369 /OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs
parentMerge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork (diff)
parent create a new ode character also with the new information (diff)
downloadopensim-SC-926db81c5713e3e57b8f5d97ad7ebe7ea25784f3.zip
opensim-SC-926db81c5713e3e57b8f5d97ad7ebe7ea25784f3.tar.gz
opensim-SC-926db81c5713e3e57b8f5d97ad7ebe7ea25784f3.tar.bz2
opensim-SC-926db81c5713e3e57b8f5d97ad7ebe7ea25784f3.tar.xz
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
Diffstat (limited to 'OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs')
-rw-r--r--OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs b/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs
index 7d1d2fe..2ba5940 100644
--- a/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs
+++ b/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs
@@ -1388,13 +1388,13 @@ namespace OpenSim.Region.Physics.OdePlugin
1388 1388
1389 #region Add/Remove Entities 1389 #region Add/Remove Entities
1390 1390
1391 public override PhysicsActor AddAvatar(string avName, Vector3 position, Vector3 size, bool isFlying) 1391 public override PhysicsActor AddAvatar(string avName, Vector3 position, Vector3 size, float feetOffset, bool isFlying)
1392 { 1392 {
1393 Vector3 pos; 1393 Vector3 pos;
1394 pos.X = position.X; 1394 pos.X = position.X;
1395 pos.Y = position.Y; 1395 pos.Y = position.Y;
1396 pos.Z = position.Z; 1396 pos.Z = position.Z;
1397 OdeCharacter newAv = new OdeCharacter(avName, this, pos, size, avDensity, avMovementDivisorWalk, avMovementDivisorRun); 1397 OdeCharacter newAv = new OdeCharacter(avName, this, pos, size, feetOffset, avDensity, avMovementDivisorWalk, avMovementDivisorRun);
1398 newAv.Flying = isFlying; 1398 newAv.Flying = isFlying;
1399 newAv.MinimumGroundFlightOffset = minimumGroundFlightOffset; 1399 newAv.MinimumGroundFlightOffset = minimumGroundFlightOffset;
1400 1400