diff options
author | Justin Clark-Casey (justincc) | 2011-11-16 23:01:59 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2011-11-16 23:01:59 +0000 |
commit | b6d83e9c0f4bd1d450e36270278285be50d5ace8 (patch) | |
tree | a5a05ee468964d2a5a8b90b186145e615368de71 /OpenSim/Region/Physics/OdePlugin/ODECharacter.cs | |
parent | Call public ForEach instead of using m_entities directly. No semantic changes... (diff) | |
download | opensim-SC-b6d83e9c0f4bd1d450e36270278285be50d5ace8.zip opensim-SC-b6d83e9c0f4bd1d450e36270278285be50d5ace8.tar.gz opensim-SC-b6d83e9c0f4bd1d450e36270278285be50d5ace8.tar.bz2 opensim-SC-b6d83e9c0f4bd1d450e36270278285be50d5ace8.tar.xz |
Stop OdePrim and OdeCharacter insanely overriding set LocalID to set their own private m_localID property but leaving get to return the then unset PhysicsActor.LocalId!
Instead, just have both subclasses use the PhysicsActor.LocalID property.
This restores collision functionality that fell away in 45c7789 yesterday
Diffstat (limited to 'OpenSim/Region/Physics/OdePlugin/ODECharacter.cs')
-rw-r--r-- | OpenSim/Region/Physics/OdePlugin/ODECharacter.cs | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs index 3630510..c37d588 100644 --- a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs +++ b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs | |||
@@ -108,7 +108,6 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
108 | /// </summary> | 108 | /// </summary> |
109 | private Vector3 m_taintForce; | 109 | private Vector3 m_taintForce; |
110 | 110 | ||
111 | internal uint m_localID = 0; | ||
112 | // taints and their non-tainted counterparts | 111 | // taints and their non-tainted counterparts |
113 | private bool m_isPhysical = false; // the current physical status | 112 | private bool m_isPhysical = false; // the current physical status |
114 | private bool m_tainted_isPhysical = false; // set when the physical status is tainted (false=not existing in physics engine, true=existing) | 113 | private bool m_tainted_isPhysical = false; // set when the physical status is tainted (false=not existing in physics engine, true=existing) |
@@ -231,11 +230,6 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
231 | set { m_alwaysRun = value; } | 230 | set { m_alwaysRun = value; } |
232 | } | 231 | } |
233 | 232 | ||
234 | public override uint LocalID | ||
235 | { | ||
236 | set { m_localID = value; } | ||
237 | } | ||
238 | |||
239 | public override bool Grabbed | 233 | public override bool Grabbed |
240 | { | 234 | { |
241 | set { return; } | 235 | set { return; } |