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/Framework/Scenes/EntityBase.cs | |
| parent | Call public ForEach instead of using m_entities directly. No semantic changes... (diff) | |
| download | opensim-SC_OLD-b6d83e9c0f4bd1d450e36270278285be50d5ace8.zip opensim-SC_OLD-b6d83e9c0f4bd1d450e36270278285be50d5ace8.tar.gz opensim-SC_OLD-b6d83e9c0f4bd1d450e36270278285be50d5ace8.tar.bz2 opensim-SC_OLD-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/Framework/Scenes/EntityBase.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/EntityBase.cs | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/EntityBase.cs b/OpenSim/Region/Framework/Scenes/EntityBase.cs index 664be01..741f53b 100644 --- a/OpenSim/Region/Framework/Scenes/EntityBase.cs +++ b/OpenSim/Region/Framework/Scenes/EntityBase.cs | |||
| @@ -103,7 +103,11 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 103 | public virtual uint LocalId | 103 | public virtual uint LocalId |
| 104 | { | 104 | { |
| 105 | get { return m_localId; } | 105 | get { return m_localId; } |
| 106 | set { m_localId = value; } | 106 | set |
| 107 | { | ||
| 108 | m_localId = value; | ||
| 109 | // m_log.DebugFormat("[ENTITY BASE]: Set part {0} to local id {1}", Name, m_localId); | ||
| 110 | } | ||
| 107 | } | 111 | } |
| 108 | 112 | ||
| 109 | /// <summary> | 113 | /// <summary> |