aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2011-08-30 22:39:16 +0100
committerJustin Clark-Casey (justincc)2011-08-30 22:39:16 +0100
commita90e1cf3aa6ae832e1ff4f2683e1c991eb9a849f (patch)
tree2a0b33039eeb611967b40051b387ddcf527dba87
parentrefactor: migrate DropObject handling fully into AttachmentsModule from Scene (diff)
downloadopensim-SC_OLD-a90e1cf3aa6ae832e1ff4f2683e1c991eb9a849f.zip
opensim-SC_OLD-a90e1cf3aa6ae832e1ff4f2683e1c991eb9a849f.tar.gz
opensim-SC_OLD-a90e1cf3aa6ae832e1ff4f2683e1c991eb9a849f.tar.bz2
opensim-SC_OLD-a90e1cf3aa6ae832e1ff4f2683e1c991eb9a849f.tar.xz
add Name property to ISceneEntity
-rw-r--r--OpenSim/Framework/ISceneEntity.cs1
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs7
2 files changed, 6 insertions, 2 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; }
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index c453366..74e8783 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -254,11 +254,14 @@ namespace OpenSim.Region.Framework.Scenes
254 /// </summary> 254 /// </summary>
255 public override string Name 255 public override string Name
256 { 256 {
257 get { 257 get
258 {
258 if (RootPart == null) 259 if (RootPart == null)
259 return String.Empty; 260 return String.Empty;
260 return RootPart.Name; 261 else
262 return RootPart.Name;
261 } 263 }
264
262 set { RootPart.Name = value; } 265 set { RootPart.Name = value; }
263 } 266 }
264 267