diff options
| author | Melanie | 2010-05-21 21:16:04 +0100 |
|---|---|---|
| committer | Melanie | 2010-05-21 21:16:04 +0100 |
| commit | 297bcb5c3d462128c5c81f35aa7a574e567583d5 (patch) | |
| tree | be7744848c474a8241f1d1c0e1f0114cfb824e16 /OpenSim/Region/Framework/Scenes/EntityBase.cs | |
| parent | Merge branch 'master' into careminster-presence-refactor (diff) | |
| parent | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff) | |
| download | opensim-SC-297bcb5c3d462128c5c81f35aa7a574e567583d5.zip opensim-SC-297bcb5c3d462128c5c81f35aa7a574e567583d5.tar.gz opensim-SC-297bcb5c3d462128c5c81f35aa7a574e567583d5.tar.bz2 opensim-SC-297bcb5c3d462128c5c81f35aa7a574e567583d5.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/EntityBase.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/EntityBase.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/EntityBase.cs b/OpenSim/Region/Framework/Scenes/EntityBase.cs index 1c76c54..4e25c46 100644 --- a/OpenSim/Region/Framework/Scenes/EntityBase.cs +++ b/OpenSim/Region/Framework/Scenes/EntityBase.cs | |||
| @@ -28,11 +28,12 @@ | |||
| 28 | using System; | 28 | using System; |
| 29 | using System.Runtime.Serialization; | 29 | using System.Runtime.Serialization; |
| 30 | using System.Security.Permissions; | 30 | using System.Security.Permissions; |
| 31 | using OpenSim.Framework; | ||
| 31 | using OpenMetaverse; | 32 | using OpenMetaverse; |
| 32 | 33 | ||
| 33 | namespace OpenSim.Region.Framework.Scenes | 34 | namespace OpenSim.Region.Framework.Scenes |
| 34 | { | 35 | { |
| 35 | public abstract class EntityBase | 36 | public abstract class EntityBase : ISceneEntity |
| 36 | { | 37 | { |
| 37 | /// <summary> | 38 | /// <summary> |
| 38 | /// The scene to which this entity belongs | 39 | /// The scene to which this entity belongs |