aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/OdePlugin
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Physics/OdePlugin')
-rw-r--r--OpenSim/Region/Physics/OdePlugin/ODECharacter.cs3
-rw-r--r--OpenSim/Region/Physics/OdePlugin/OdePlugin.cs4
2 files changed, 4 insertions, 3 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
index 0f1446c..c41f812 100644
--- a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
+++ b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
@@ -104,7 +104,7 @@ namespace OpenSim.Region.Physics.OdePlugin
104 public d.Mass ShellMass; 104 public d.Mass ShellMass;
105 public bool collidelock = false; 105 public bool collidelock = false;
106 106
107 public OdeCharacter(String avName, OdeScene parent_scene, PhysicsVector pos, CollisionLocker dode) 107 public OdeCharacter(String avName, OdeScene parent_scene, PhysicsVector pos, CollisionLocker dode, PhysicsVector size)
108 { 108 {
109 ode = dode; 109 ode = dode;
110 _velocity = new PhysicsVector(); 110 _velocity = new PhysicsVector();
@@ -131,6 +131,7 @@ namespace OpenSim.Region.Physics.OdePlugin
131 { 131 {
132 m_colliderarr[i] = false; 132 m_colliderarr[i] = false;
133 } 133 }
134 CAPSULE_LENGTH = (size.Z - ((size.Z * 0.52f)));
134 135
135 lock (OdeScene.OdeLock) 136 lock (OdeScene.OdeLock)
136 { 137 {
diff --git a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
index c4d249d..3817868 100644
--- a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
+++ b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
@@ -702,13 +702,13 @@ namespace OpenSim.Region.Physics.OdePlugin
702 } 702 }
703 } 703 }
704 704
705 public override PhysicsActor AddAvatar(string avName, PhysicsVector position) 705 public override PhysicsActor AddAvatar(string avName, PhysicsVector position, PhysicsVector size)
706 { 706 {
707 PhysicsVector pos = new PhysicsVector(); 707 PhysicsVector pos = new PhysicsVector();
708 pos.X = position.X; 708 pos.X = position.X;
709 pos.Y = position.Y; 709 pos.Y = position.Y;
710 pos.Z = position.Z; 710 pos.Z = position.Z;
711 OdeCharacter newAv = new OdeCharacter(avName, this, pos, ode); 711 OdeCharacter newAv = new OdeCharacter(avName, this, pos, ode, size);
712 _characters.Add(newAv); 712 _characters.Add(newAv);
713 return newAv; 713 return newAv;
714 } 714 }