diff options
Diffstat (limited to 'OpenSim/Region/Physics/UbitOdePlugin/ODECharacter.cs')
-rw-r--r-- | OpenSim/Region/Physics/UbitOdePlugin/ODECharacter.cs | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/OpenSim/Region/Physics/UbitOdePlugin/ODECharacter.cs b/OpenSim/Region/Physics/UbitOdePlugin/ODECharacter.cs index 9a22331..4266fda 100644 --- a/OpenSim/Region/Physics/UbitOdePlugin/ODECharacter.cs +++ b/OpenSim/Region/Physics/UbitOdePlugin/ODECharacter.cs | |||
@@ -137,7 +137,6 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
137 | public bool bad = false; | 137 | public bool bad = false; |
138 | 138 | ||
139 | float mu; | 139 | float mu; |
140 | float bounce; | ||
141 | 140 | ||
142 | public OdeCharacter(String avName, OdeScene parent_scene, Vector3 pos, Vector3 size, float pid_d, float pid_p, float capsule_radius, float density, float walk_divisor, float rundivisor) | 141 | public OdeCharacter(String avName, OdeScene parent_scene, Vector3 pos, Vector3 size, float pid_d, float pid_p, float capsule_radius, float density, float walk_divisor, float rundivisor) |
143 | { | 142 | { |
@@ -170,7 +169,6 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
170 | m_mass = 80f; // sure we have a default | 169 | m_mass = 80f; // sure we have a default |
171 | 170 | ||
172 | mu = parent_scene.AvatarFriction; | 171 | mu = parent_scene.AvatarFriction; |
173 | bounce = parent_scene.AvatarBounce; | ||
174 | 172 | ||
175 | walkDivisor = walk_divisor; | 173 | walkDivisor = walk_divisor; |
176 | runDivisor = rundivisor; | 174 | runDivisor = rundivisor; |
@@ -194,7 +192,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
194 | public override void getContactData(ref ContactData cdata) | 192 | public override void getContactData(ref ContactData cdata) |
195 | { | 193 | { |
196 | cdata.mu = mu; | 194 | cdata.mu = mu; |
197 | cdata.bounce = bounce; | 195 | cdata.bounce = 0; |
198 | cdata.softcolide = false; | 196 | cdata.softcolide = false; |
199 | } | 197 | } |
200 | 198 | ||