diff options
| author | Tom | 2011-09-04 07:06:36 -0700 |
|---|---|---|
| committer | Tom | 2011-09-04 07:06:36 -0700 |
| commit | 66dec3b8742eff04fbbcc6e3249fe4ba87986500 (patch) | |
| tree | 76cc708a821d35fac5cdbbce2de304b47064e732 /OpenSim/Region/Framework/Scenes/EntityBase.cs | |
| parent | Guard another nullref (diff) | |
| parent | Fixed BulletSim config files for Linux *.so libraries. (diff) | |
| download | opensim-SC-66dec3b8742eff04fbbcc6e3249fe4ba87986500.zip opensim-SC-66dec3b8742eff04fbbcc6e3249fe4ba87986500.tar.gz opensim-SC-66dec3b8742eff04fbbcc6e3249fe4ba87986500.tar.bz2 opensim-SC-66dec3b8742eff04fbbcc6e3249fe4ba87986500.tar.xz | |
Resolve merge commits, stage 1
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/EntityBase.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/EntityBase.cs | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/OpenSim/Region/Framework/Scenes/EntityBase.cs b/OpenSim/Region/Framework/Scenes/EntityBase.cs index 6fd38e5..213431a 100644 --- a/OpenSim/Region/Framework/Scenes/EntityBase.cs +++ b/OpenSim/Region/Framework/Scenes/EntityBase.cs | |||
| @@ -66,12 +66,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 66 | /// <summary> | 66 | /// <summary> |
| 67 | /// Signals whether this entity was in a scene but has since been removed from it. | 67 | /// Signals whether this entity was in a scene but has since been removed from it. |
| 68 | /// </summary> | 68 | /// </summary> |
| 69 | public bool IsDeleted | 69 | public bool IsDeleted { get; protected internal set; } |
| 70 | { | ||
| 71 | get { return m_isDeleted; } | ||
| 72 | set { m_isDeleted = value; } | ||
| 73 | } | ||
| 74 | protected bool m_isDeleted; | ||
| 75 | 70 | ||
| 76 | protected Vector3 m_pos; | 71 | protected Vector3 m_pos; |
| 77 | 72 | ||