diff options
| author | Melanie | 2011-11-17 19:04:27 +0000 |
|---|---|---|
| committer | Melanie | 2011-11-17 19:04:27 +0000 |
| commit | 31736b1aac0387e51fe37ea9bab2e2e8c86988b6 (patch) | |
| tree | 14fbdc5f9b677185db1fe8080dafe28796c09336 /OpenSim/Region/Framework/Scenes/EntityBase.cs | |
| parent | Merge branch 'master' into bigmerge (diff) | |
| parent | Stop OdePrim and OdeCharacter insanely overriding set LocalID to set their ow... (diff) | |
| download | opensim-SC-31736b1aac0387e51fe37ea9bab2e2e8c86988b6.zip opensim-SC-31736b1aac0387e51fe37ea9bab2e2e8c86988b6.tar.gz opensim-SC-31736b1aac0387e51fe37ea9bab2e2e8c86988b6.tar.bz2 opensim-SC-31736b1aac0387e51fe37ea9bab2e2e8c86988b6.tar.xz | |
Merge branch 'master' into bigmerge
Conflicts:
OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
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> |