diff options
author | Justin Clarke Casey | 2008-06-21 18:11:45 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2008-06-21 18:11:45 +0000 |
commit | 3a111650cbaf3294d9d12bfb1fa00ab91600991d (patch) | |
tree | 605555f84aab92d8fb829a71ea5fb77a1c85615b /OpenSim/Region/Environment/Scenes | |
parent | Changes selection criteria to allow meshing of more sphere prim configurations. (diff) | |
download | opensim-SC-3a111650cbaf3294d9d12bfb1fa00ab91600991d.zip opensim-SC-3a111650cbaf3294d9d12bfb1fa00ab91600991d.tar.gz opensim-SC-3a111650cbaf3294d9d12bfb1fa00ab91600991d.tar.bz2 opensim-SC-3a111650cbaf3294d9d12bfb1fa00ab91600991d.tar.xz |
* minor: override the name of the sog such that it gets/sets the root part name
Diffstat (limited to 'OpenSim/Region/Environment/Scenes')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/EntityBase.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs | 9 |
2 files changed, 10 insertions, 1 deletions
diff --git a/OpenSim/Region/Environment/Scenes/EntityBase.cs b/OpenSim/Region/Environment/Scenes/EntityBase.cs index 4b6ca49..1970896 100644 --- a/OpenSim/Region/Environment/Scenes/EntityBase.cs +++ b/OpenSim/Region/Environment/Scenes/EntityBase.cs | |||
@@ -56,7 +56,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
56 | protected string m_name; | 56 | protected string m_name; |
57 | 57 | ||
58 | /// <summary> | 58 | /// <summary> |
59 | /// | 59 | /// The name of this entity |
60 | /// </summary> | 60 | /// </summary> |
61 | public virtual string Name | 61 | public virtual string Name |
62 | { | 62 | { |
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs index f94830e..0d759cf 100644 --- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs | |||
@@ -116,6 +116,15 @@ namespace OpenSim.Region.Environment.Scenes | |||
116 | private int m_startparameter = 0; | 116 | private int m_startparameter = 0; |
117 | 117 | ||
118 | #region Properties | 118 | #region Properties |
119 | |||
120 | /// <summary> | ||
121 | /// The name of an object grouping is always the same as its root part | ||
122 | /// </summary> | ||
123 | public override string Name | ||
124 | { | ||
125 | get { return RootPart.Name; } | ||
126 | set { RootPart.Name = value; } | ||
127 | } | ||
119 | 128 | ||
120 | /// <summary> | 129 | /// <summary> |
121 | /// Added because the Parcel code seems to use it | 130 | /// Added because the Parcel code seems to use it |