diff options
| author | Diva Canto | 2014-12-25 08:01:50 -0800 |
|---|---|---|
| committer | Diva Canto | 2014-12-25 08:01:50 -0800 |
| commit | 27c34b69bf5960e02b087f9f298dcbe19f03b142 (patch) | |
| tree | f299009958858da9db464dcbc84bd03beae0ca15 /OpenSim/Framework/ISceneObject.cs | |
| parent | Revert "Update libomv to grab latest bug fixes for Collada upload." (diff) | |
| parent | If a moap entry has EnableWhiteList but WhiteList == null, then properly bloc... (diff) | |
| download | opensim-SC_OLD-27c34b69bf5960e02b087f9f298dcbe19f03b142.zip opensim-SC_OLD-27c34b69bf5960e02b087f9f298dcbe19f03b142.tar.gz opensim-SC_OLD-27c34b69bf5960e02b087f9f298dcbe19f03b142.tar.bz2 opensim-SC_OLD-27c34b69bf5960e02b087f9f298dcbe19f03b142.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Framework/ISceneObject.cs')
| -rw-r--r-- | OpenSim/Framework/ISceneObject.cs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Framework/ISceneObject.cs b/OpenSim/Framework/ISceneObject.cs index afac9b8..754b77b 100644 --- a/OpenSim/Framework/ISceneObject.cs +++ b/OpenSim/Framework/ISceneObject.cs | |||
| @@ -32,6 +32,8 @@ namespace OpenSim.Framework | |||
| 32 | { | 32 | { |
| 33 | public interface ISceneObject | 33 | public interface ISceneObject |
| 34 | { | 34 | { |
| 35 | string Name { get; } | ||
| 36 | |||
| 35 | UUID UUID { get; } | 37 | UUID UUID { get; } |
| 36 | 38 | ||
| 37 | /// <summary> | 39 | /// <summary> |