diff options
author | Teravus Ovares | 2008-02-13 23:14:41 +0000 |
---|---|---|
committer | Teravus Ovares | 2008-02-13 23:14:41 +0000 |
commit | 3588d89b2cba36415991c46c300b1f9c94f109bf (patch) | |
tree | 985987f9e0a2e60815134f05a4d69c658aef4ed4 /OpenSim/Region/Physics/OdePlugin/ODECharacter.cs | |
parent | * Fixed another bug in avatarpicker ('surname'/'lastname' mixup) (diff) | |
download | opensim-SC_OLD-3588d89b2cba36415991c46c300b1f9c94f109bf.zip opensim-SC_OLD-3588d89b2cba36415991c46c300b1f9c94f109bf.tar.gz opensim-SC_OLD-3588d89b2cba36415991c46c300b1f9c94f109bf.tar.bz2 opensim-SC_OLD-3588d89b2cba36415991c46c300b1f9c94f109bf.tar.xz |
* Bigish ODE stability Update. Run Prebuild
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Physics/OdePlugin/ODECharacter.cs | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs index 80c2a48..75d62cc 100644 --- a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs +++ b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs | |||
@@ -16,7 +16,7 @@ | |||
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY | 16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY |
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | 17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED |
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | 18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE |
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | 19 | * DISCLAIMEd. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY |
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | 20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES |
21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | 21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; |
22 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | 22 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND |
@@ -35,7 +35,7 @@ using OpenSim.Region.Physics.Manager; | |||
35 | namespace OpenSim.Region.Physics.OdePlugin | 35 | namespace OpenSim.Region.Physics.OdePlugin |
36 | { | 36 | { |
37 | /// <summary> | 37 | /// <summary> |
38 | /// Various properties that ODE uses for AMotors but isn't exposed in ODE.NET so we must define them ourselves. | 38 | /// Various properties that ODE uses for AMotors but isn't exposed in d.NET so we must define them ourselves. |
39 | /// </summary> | 39 | /// </summary> |
40 | 40 | ||
41 | public enum dParam : int | 41 | public enum dParam : int |
@@ -87,6 +87,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
87 | private bool m_hackSentFall = false; | 87 | private bool m_hackSentFall = false; |
88 | private bool m_hackSentFly = false; | 88 | private bool m_hackSentFly = false; |
89 | private bool m_foundDebian = false; | 89 | private bool m_foundDebian = false; |
90 | private CollisionLocker ode; | ||
90 | 91 | ||
91 | private string m_name = String.Empty; | 92 | private string m_name = String.Empty; |
92 | 93 | ||
@@ -103,8 +104,9 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
103 | public d.Mass ShellMass; | 104 | public d.Mass ShellMass; |
104 | public bool collidelock = false; | 105 | public bool collidelock = false; |
105 | 106 | ||
106 | public OdeCharacter(String avName, OdeScene parent_scene, PhysicsVector pos) | 107 | public OdeCharacter(String avName, OdeScene parent_scene, PhysicsVector pos, CollisionLocker dode) |
107 | { | 108 | { |
109 | ode = dode; | ||
108 | _velocity = new PhysicsVector(); | 110 | _velocity = new PhysicsVector(); |
109 | _target_velocity = new PhysicsVector(); | 111 | _target_velocity = new PhysicsVector(); |
110 | _position = pos; | 112 | _position = pos; |
@@ -801,5 +803,9 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
801 | d.BodyDestroy(Body); | 803 | d.BodyDestroy(Body); |
802 | } | 804 | } |
803 | } | 805 | } |
806 | public override void CrossingFailure() | ||
807 | { | ||
808 | |||
809 | } | ||
804 | } | 810 | } |
805 | } | 811 | } |