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/Framework/ISceneEntity.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 '')
| -rw-r--r-- | OpenSim/Framework/ISceneEntity.cs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Framework/ISceneEntity.cs b/OpenSim/Framework/ISceneEntity.cs index 5ac364f..c0ea302 100644 --- a/OpenSim/Framework/ISceneEntity.cs +++ b/OpenSim/Framework/ISceneEntity.cs | |||
| @@ -31,6 +31,7 @@ namespace OpenSim.Framework | |||
| 31 | { | 31 | { |
| 32 | public interface ISceneEntity | 32 | public interface ISceneEntity |
| 33 | { | 33 | { |
| 34 | string Name { get; set; } | ||
| 34 | UUID UUID { get; } | 35 | UUID UUID { get; } |
| 35 | uint LocalId { get; } | 36 | uint LocalId { get; } |
| 36 | Vector3 AbsolutePosition { get; } | 37 | Vector3 AbsolutePosition { get; } |