diff options
Added the SetPartText access method to SceneObjectGroup to set the text of member SceneObjectParts.
Diffstat (limited to 'OpenSim/Region')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs | 52 |
1 files changed, 35 insertions, 17 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs index dae4b5f..42fe5eb 100644 --- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs | |||
@@ -82,7 +82,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
82 | part.GroupPosition = value; | 82 | part.GroupPosition = value; |
83 | } | 83 | } |
84 | } | 84 | } |
85 | } | 85 | } |
86 | } | 86 | } |
87 | 87 | ||
88 | public override uint LocalId | 88 | public override uint LocalId |
@@ -112,7 +112,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
112 | protected bool m_isSelected = false; | 112 | protected bool m_isSelected = false; |
113 | public bool IsSelected | 113 | public bool IsSelected |
114 | { | 114 | { |
115 | get{ return m_isSelected;} | 115 | get { return m_isSelected; } |
116 | set { m_isSelected = value; } | 116 | set { m_isSelected = value; } |
117 | } | 117 | } |
118 | 118 | ||
@@ -134,7 +134,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
134 | { | 134 | { |
135 | m_scene = scene; | 135 | m_scene = scene; |
136 | m_regionHandle = regionHandle; | 136 | m_regionHandle = regionHandle; |
137 | 137 | ||
138 | StringReader sr = new StringReader(xmlData); | 138 | StringReader sr = new StringReader(xmlData); |
139 | XmlTextReader reader = new XmlTextReader(sr); | 139 | XmlTextReader reader = new XmlTextReader(sr); |
140 | reader.ReadStartElement("SceneObjectGroup"); | 140 | reader.ReadStartElement("SceneObjectGroup"); |
@@ -168,7 +168,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
168 | m_regionHandle = regionHandle; | 168 | m_regionHandle = regionHandle; |
169 | m_scene = scene; | 169 | m_scene = scene; |
170 | 170 | ||
171 | // this.Pos = pos; | 171 | // this.Pos = pos; |
172 | LLVector3 rootOffset = new LLVector3(0, 0, 0); | 172 | LLVector3 rootOffset = new LLVector3(0, 0, 0); |
173 | SceneObjectPart newPart = new SceneObjectPart(m_regionHandle, this, ownerID, localID, shape, pos, rootOffset); | 173 | SceneObjectPart newPart = new SceneObjectPart(m_regionHandle, this, ownerID, localID, shape, pos, rootOffset); |
174 | this.m_parts.Add(newPart.UUID, newPart); | 174 | this.m_parts.Add(newPart.UUID, newPart); |
@@ -188,11 +188,11 @@ namespace OpenSim.Region.Environment.Scenes | |||
188 | writer.WriteEndElement(); | 188 | writer.WriteEndElement(); |
189 | writer.WriteEndElement(); | 189 | writer.WriteEndElement(); |
190 | writer.Close(); | 190 | writer.Close(); |
191 | // System.Console.WriteLine("prim: " + sw.ToString()); | 191 | // System.Console.WriteLine("prim: " + sw.ToString()); |
192 | return sw.ToString(); | 192 | return sw.ToString(); |
193 | // st.Close(); | 193 | // st.Close(); |
194 | // return ""; | 194 | // return ""; |
195 | 195 | ||
196 | } | 196 | } |
197 | 197 | ||
198 | #region Copying | 198 | #region Copying |
@@ -391,7 +391,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
391 | linkPart.ParentID = this.m_rootPart.LocalID; | 391 | linkPart.ParentID = this.m_rootPart.LocalID; |
392 | this.m_parts.Add(linkPart.UUID, linkPart); | 392 | this.m_parts.Add(linkPart.UUID, linkPart); |
393 | linkPart.SetParent(this); | 393 | linkPart.SetParent(this); |
394 | 394 | ||
395 | //TODO: rest of parts | 395 | //TODO: rest of parts |
396 | 396 | ||
397 | m_scene.EventManager.OnBackup -= objectGroup.ProcessBackup; | 397 | m_scene.EventManager.OnBackup -= objectGroup.ProcessBackup; |
@@ -450,11 +450,11 @@ namespace OpenSim.Region.Environment.Scenes | |||
450 | /// <param name="name"></param> | 450 | /// <param name="name"></param> |
451 | public void SetPartName(string name, uint localID) | 451 | public void SetPartName(string name, uint localID) |
452 | { | 452 | { |
453 | SceneObjectPart part = this.GetChildPrim(localID); | 453 | SceneObjectPart part = this.GetChildPrim(localID); |
454 | if (part != null) | 454 | if (part != null) |
455 | { | 455 | { |
456 | part.PartName = name; | 456 | part.PartName = name; |
457 | } | 457 | } |
458 | } | 458 | } |
459 | 459 | ||
460 | public void SetPartDescription(string des, uint localID) | 460 | public void SetPartDescription(string des, uint localID) |
@@ -466,6 +466,24 @@ namespace OpenSim.Region.Environment.Scenes | |||
466 | } | 466 | } |
467 | } | 467 | } |
468 | 468 | ||
469 | public void SetPartText(string text, uint localID) | ||
470 | { | ||
471 | SceneObjectPart part = this.GetChildPrim(localID); | ||
472 | if (part != null) | ||
473 | { | ||
474 | part.Text = text; | ||
475 | } | ||
476 | } | ||
477 | |||
478 | public void SetPartText(string text, LLUUID partID) | ||
479 | { | ||
480 | SceneObjectPart part = this.GetChildPrim(partID); | ||
481 | if (part != null) | ||
482 | { | ||
483 | part.Text = text; | ||
484 | } | ||
485 | } | ||
486 | |||
469 | /// <summary> | 487 | /// <summary> |
470 | /// | 488 | /// |
471 | /// </summary> | 489 | /// </summary> |
@@ -740,13 +758,13 @@ namespace OpenSim.Region.Environment.Scenes | |||
740 | /// <param name="part"></param> | 758 | /// <param name="part"></param> |
741 | internal void SendPartFullUpdate(IClientAPI remoteClient, SceneObjectPart part) | 759 | internal void SendPartFullUpdate(IClientAPI remoteClient, SceneObjectPart part) |
742 | { | 760 | { |
743 | if( m_rootPart == part ) | 761 | if (m_rootPart == part) |
744 | { | 762 | { |
745 | part.SendFullUpdateToClient( remoteClient, Pos ); | 763 | part.SendFullUpdateToClient(remoteClient, Pos); |
746 | } | 764 | } |
747 | else | 765 | else |
748 | { | 766 | { |
749 | part.SendFullUpdateToClient( remoteClient ); | 767 | part.SendFullUpdateToClient(remoteClient); |
750 | } | 768 | } |
751 | } | 769 | } |
752 | 770 | ||