diff options
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs index bc3d5c0..1b541c4 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 | } |
@@ -935,6 +935,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
935 | SetAttachmentPoint(Convert.ToByte(attachmentpoint)); | 935 | SetAttachmentPoint(Convert.ToByte(attachmentpoint)); |
936 | 936 | ||
937 | avatar.AddAttachment(this); | 937 | avatar.AddAttachment(this); |
938 | m_log.DebugFormat("[SOG]: Added att {0} to avie {1}", UUID, avatar.UUID); | ||
938 | 939 | ||
939 | if (!silent) | 940 | if (!silent) |
940 | { | 941 | { |
@@ -3349,19 +3350,19 @@ namespace OpenSim.Region.Framework.Scenes | |||
3349 | 3350 | ||
3350 | public virtual string ExtraToXmlString() | 3351 | public virtual string ExtraToXmlString() |
3351 | { | 3352 | { |
3352 | return "<ExtraFromAssetID>" + GetFromAssetID().ToString() + "</ExtraFromAssetID>"; | 3353 | return "<ExtraFromItemID>" + GetFromItemID().ToString() + "</ExtraFromItemID>"; |
3353 | } | 3354 | } |
3354 | 3355 | ||
3355 | public virtual void ExtraFromXmlString(string xmlstr) | 3356 | public virtual void ExtraFromXmlString(string xmlstr) |
3356 | { | 3357 | { |
3357 | string id = xmlstr.Substring(xmlstr.IndexOf("<ExtraFromAssetID>")); | 3358 | string id = xmlstr.Substring(xmlstr.IndexOf("<ExtraFromItemID>")); |
3358 | id = xmlstr.Replace("<ExtraFromAssetID>", ""); | 3359 | id = xmlstr.Replace("<ExtraFromItemID>", ""); |
3359 | id = id.Replace("</ExtraFromAssetID>", ""); | 3360 | id = id.Replace("</ExtraFromItemID>", ""); |
3360 | 3361 | ||
3361 | UUID uuid = UUID.Zero; | 3362 | UUID uuid = UUID.Zero; |
3362 | UUID.TryParse(id, out uuid); | 3363 | UUID.TryParse(id, out uuid); |
3363 | 3364 | ||
3364 | SetFromAssetID(uuid); | 3365 | SetFromItemID(uuid); |
3365 | } | 3366 | } |
3366 | #endregion | 3367 | #endregion |
3367 | 3368 | ||