aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs18
1 files changed, 9 insertions, 9 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index bc3d5c0..708c455 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -447,22 +447,22 @@ namespace OpenSim.Region.Framework.Scenes
447 } 447 }
448 } 448 }
449 449
450 public void SetFromAssetID(UUID AssetId) 450 public void SetFromItemID(UUID AssetId)
451 { 451 {
452 lock (m_parts) 452 lock (m_parts)
453 { 453 {
454 foreach (SceneObjectPart part in m_parts.Values) 454 foreach (SceneObjectPart part in m_parts.Values)
455 { 455 {
456 part.FromAssetID = AssetId; 456 part.FromItemID = AssetId;
457 } 457 }
458 } 458 }
459 } 459 }
460 460
461 public UUID GetFromAssetID() 461 public UUID GetFromItemID()
462 { 462 {
463 if (m_rootPart != null) 463 if (m_rootPart != null)
464 { 464 {
465 return m_rootPart.FromAssetID; 465 return m_rootPart.FromItemID;
466 } 466 }
467 return UUID.Zero; 467 return UUID.Zero;
468 } 468 }
@@ -3349,19 +3349,19 @@ namespace OpenSim.Region.Framework.Scenes
3349 3349
3350 public virtual string ExtraToXmlString() 3350 public virtual string ExtraToXmlString()
3351 { 3351 {
3352 return "<ExtraFromAssetID>" + GetFromAssetID().ToString() + "</ExtraFromAssetID>"; 3352 return "<ExtraFromItemID>" + GetFromItemID().ToString() + "</ExtraFromItemID>";
3353 } 3353 }
3354 3354
3355 public virtual void ExtraFromXmlString(string xmlstr) 3355 public virtual void ExtraFromXmlString(string xmlstr)
3356 { 3356 {
3357 string id = xmlstr.Substring(xmlstr.IndexOf("<ExtraFromAssetID>")); 3357 string id = xmlstr.Substring(xmlstr.IndexOf("<ExtraFromItemID>"));
3358 id = xmlstr.Replace("<ExtraFromAssetID>", ""); 3358 id = xmlstr.Replace("<ExtraFromItemID>", "");
3359 id = id.Replace("</ExtraFromAssetID>", ""); 3359 id = id.Replace("</ExtraFromItemID>", "");
3360 3360
3361 UUID uuid = UUID.Zero; 3361 UUID uuid = UUID.Zero;
3362 UUID.TryParse(id, out uuid); 3362 UUID.TryParse(id, out uuid);
3363 3363
3364 SetFromAssetID(uuid); 3364 SetFromItemID(uuid);
3365 } 3365 }
3366 #endregion 3366 #endregion
3367 3367