diff options
author | Diva Canto | 2009-08-15 09:36:45 -0700 |
---|---|---|
committer | Diva Canto | 2009-08-15 09:36:45 -0700 |
commit | 1bbf06405c109a4299a9494555f8223dd954610b (patch) | |
tree | 6f1188d2ebabddd7969604ccff9128fdcb11ad1f /OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |
parent | Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC-1bbf06405c109a4299a9494555f8223dd954610b.zip opensim-SC-1bbf06405c109a4299a9494555f8223dd954610b.tar.gz opensim-SC-1bbf06405c109a4299a9494555f8223dd954610b.tar.bz2 opensim-SC-1bbf06405c109a4299a9494555f8223dd954610b.tar.xz |
Changed FromAssetID to FromItemID
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs index c86e4a1..00c59ca 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 | } |
@@ -3374,19 +3374,19 @@ namespace OpenSim.Region.Framework.Scenes | |||
3374 | 3374 | ||
3375 | public virtual string ExtraToXmlString() | 3375 | public virtual string ExtraToXmlString() |
3376 | { | 3376 | { |
3377 | return "<ExtraFromAssetID>" + GetFromAssetID().ToString() + "</ExtraFromAssetID>"; | 3377 | return "<ExtraFromItemID>" + GetFromItemID().ToString() + "</ExtraFromItemID>"; |
3378 | } | 3378 | } |
3379 | 3379 | ||
3380 | public virtual void ExtraFromXmlString(string xmlstr) | 3380 | public virtual void ExtraFromXmlString(string xmlstr) |
3381 | { | 3381 | { |
3382 | string id = xmlstr.Substring(xmlstr.IndexOf("<ExtraFromAssetID>")); | 3382 | string id = xmlstr.Substring(xmlstr.IndexOf("<ExtraFromItemID>")); |
3383 | id = xmlstr.Replace("<ExtraFromAssetID>", ""); | 3383 | id = xmlstr.Replace("<ExtraFromItemID>", ""); |
3384 | id = id.Replace("</ExtraFromAssetID>", ""); | 3384 | id = id.Replace("</ExtraFromItemID>", ""); |
3385 | 3385 | ||
3386 | UUID uuid = UUID.Zero; | 3386 | UUID uuid = UUID.Zero; |
3387 | UUID.TryParse(id, out uuid); | 3387 | UUID.TryParse(id, out uuid); |
3388 | 3388 | ||
3389 | SetFromAssetID(uuid); | 3389 | SetFromItemID(uuid); |
3390 | } | 3390 | } |
3391 | #endregion | 3391 | #endregion |
3392 | 3392 | ||