aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
authorDiva Canto2009-08-15 09:36:45 -0700
committerDiva Canto2009-08-15 09:36:45 -0700
commit1bbf06405c109a4299a9494555f8223dd954610b (patch)
tree6f1188d2ebabddd7969604ccff9128fdcb11ad1f /OpenSim/Region/Framework
parentMerge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim (diff)
downloadopensim-SC_OLD-1bbf06405c109a4299a9494555f8223dd954610b.zip
opensim-SC_OLD-1bbf06405c109a4299a9494555f8223dd954610b.tar.gz
opensim-SC_OLD-1bbf06405c109a4299a9494555f8223dd954610b.tar.bz2
opensim-SC_OLD-1bbf06405c109a4299a9494555f8223dd954610b.tar.xz
Changed FromAssetID to FromItemID
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.Inventory.cs8
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs2
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneGraph.cs14
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs18
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPart.cs6
5 files changed, 24 insertions, 24 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index a941a74..cea9044 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -1906,8 +1906,8 @@ namespace OpenSim.Region.Framework.Scenes
1906 } 1906 }
1907 item.CreationDate = Util.UnixTimeSinceEpoch(); 1907 item.CreationDate = Util.UnixTimeSinceEpoch();
1908 1908
1909 // sets assetID so client can show asset as 'attached' in inventory 1909 // sets itemID so client can show item as 'attached' in inventory
1910 grp.SetFromAssetID(item.ID); 1910 grp.SetFromItemID(item.ID);
1911 1911
1912 if (InventoryService.AddItem(item)) 1912 if (InventoryService.AddItem(item))
1913 remoteClient.SendInventoryItemCreateUpdate(item, 0); 1913 remoteClient.SendInventoryItemCreateUpdate(item, 0);
@@ -2044,7 +2044,7 @@ namespace OpenSim.Region.Framework.Scenes
2044 } 2044 }
2045 else 2045 else
2046 { 2046 {
2047 group.SetFromAssetID(itemID); 2047 group.SetFromItemID(itemID);
2048 } 2048 }
2049 2049
2050 SceneObjectPart rootPart = null; 2050 SceneObjectPart rootPart = null;
@@ -2373,7 +2373,7 @@ namespace OpenSim.Region.Framework.Scenes
2373 if (part == null || part.ParentGroup == null) 2373 if (part == null || part.ParentGroup == null)
2374 return; 2374 return;
2375 2375
2376 UUID inventoryID = part.ParentGroup.GetFromAssetID(); 2376 UUID inventoryID = part.ParentGroup.GetFromItemID();
2377 2377
2378 ScenePresence presence; 2378 ScenePresence presence;
2379 if (TryGetAvatar(remoteClient.AgentId, out presence)) 2379 if (TryGetAvatar(remoteClient.AgentId, out presence))
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 107a4a4..b9edd6e 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -1962,7 +1962,7 @@ namespace OpenSim.Region.Framework.Scenes
1962 m_log.DebugFormat("[ATTACHMENT]: Received " + 1962 m_log.DebugFormat("[ATTACHMENT]: Received " +
1963 "attachment {0}, inworld asset id {1}", 1963 "attachment {0}, inworld asset id {1}",
1964 //grp.RootPart.LastOwnerID.ToString(), 1964 //grp.RootPart.LastOwnerID.ToString(),
1965 grp.GetFromAssetID(), 1965 grp.GetFromItemID(),
1966 grp.UUID.ToString()); 1966 grp.UUID.ToString());
1967 1967
1968 //grp.SetFromAssetID(grp.RootPart.LastOwnerID); 1968 //grp.SetFromAssetID(grp.RootPart.LastOwnerID);
diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
index 9599379..7b6b666 100644
--- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
@@ -442,7 +442,7 @@ namespace OpenSim.Region.Framework.Scenes
442 if (group != null) 442 if (group != null)
443 { 443 {
444 //group.DetachToGround(); 444 //group.DetachToGround();
445 m_parentScene.DetachSingleAttachmentToInv(group.GetFromAssetID(), remoteClient); 445 m_parentScene.DetachSingleAttachmentToInv(group.GetFromItemID(), remoteClient);
446 } 446 }
447 } 447 }
448 448
@@ -489,7 +489,7 @@ namespace OpenSim.Region.Framework.Scenes
489 // Calls attach with a Zero position 489 // Calls attach with a Zero position
490 // 490 //
491 AttachObject(remoteClient, objectLocalID, AttachmentPt, rot, Vector3.Zero, false); 491 AttachObject(remoteClient, objectLocalID, AttachmentPt, rot, Vector3.Zero, false);
492 m_parentScene.SendAttachEvent(objectLocalID, part.ParentGroup.GetFromAssetID(), remoteClient.AgentId); 492 m_parentScene.SendAttachEvent(objectLocalID, part.ParentGroup.GetFromItemID(), remoteClient.AgentId);
493 } 493 }
494 494
495 public SceneObjectGroup RezSingleAttachment( 495 public SceneObjectGroup RezSingleAttachment(
@@ -536,14 +536,14 @@ namespace OpenSim.Region.Framework.Scenes
536 if (entity is SceneObjectGroup) 536 if (entity is SceneObjectGroup)
537 { 537 {
538 group = (SceneObjectGroup)entity; 538 group = (SceneObjectGroup)entity;
539 if (group.GetFromAssetID() == itemID) 539 if (group.GetFromItemID() == itemID)
540 { 540 {
541 m_parentScene.SendAttachEvent(group.LocalId, itemID, UUID.Zero); 541 m_parentScene.SendAttachEvent(group.LocalId, itemID, UUID.Zero);
542 group.DetachToInventoryPrep(); 542 group.DetachToInventoryPrep();
543 m_log.Debug("[DETACH]: Saving attachpoint: " + 543 m_log.Debug("[DETACH]: Saving attachpoint: " +
544 ((uint)group.GetAttachmentPoint()).ToString()); 544 ((uint)group.GetAttachmentPoint()).ToString());
545 m_parentScene.UpdateKnownItem(remoteClient, group, 545 m_parentScene.UpdateKnownItem(remoteClient, group,
546 group.GetFromAssetID(), group.OwnerID); 546 group.GetFromItemID(), group.OwnerID);
547 m_parentScene.DeleteSceneObject(group, false); 547 m_parentScene.DeleteSceneObject(group, false);
548 return; 548 return;
549 } 549 }
@@ -588,13 +588,13 @@ namespace OpenSim.Region.Framework.Scenes
588 // Saves and gets assetID 588 // Saves and gets assetID
589 UUID itemId; 589 UUID itemId;
590 590
591 if (group.GetFromAssetID() == UUID.Zero) 591 if (group.GetFromItemID() == UUID.Zero)
592 { 592 {
593 m_parentScene.attachObjectAssetStore(remoteClient, group, remoteClient.AgentId, out itemId); 593 m_parentScene.attachObjectAssetStore(remoteClient, group, remoteClient.AgentId, out itemId);
594 } 594 }
595 else 595 else
596 { 596 {
597 itemId = group.GetFromAssetID(); 597 itemId = group.GetFromItemID();
598 } 598 }
599 599
600 m_parentScene.AttachObject(remoteClient, AttachmentPt, itemId, group); 600 m_parentScene.AttachObject(remoteClient, AttachmentPt, itemId, group);
@@ -1307,7 +1307,7 @@ namespace OpenSim.Region.Framework.Scenes
1307 group.UpdateGroupPosition(pos); 1307 group.UpdateGroupPosition(pos);
1308 group.RootPart.IsAttachment = false; 1308 group.RootPart.IsAttachment = false;
1309 group.AbsolutePosition = group.RootPart.AttachedPos; 1309 group.AbsolutePosition = group.RootPart.AttachedPos;
1310 m_parentScene.UpdateKnownItem(remoteClient, group, group.GetFromAssetID(), group.OwnerID); 1310 m_parentScene.UpdateKnownItem(remoteClient, group, group.GetFromItemID(), group.OwnerID);
1311 group.SetAttachmentPoint(attachmentPoint); 1311 group.SetAttachmentPoint(attachmentPoint);
1312 1312
1313 } 1313 }
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
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 3646811..c95667a 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -139,7 +139,7 @@ namespace OpenSim.Region.Framework.Scenes
139 public uint TimeStampTerse = 0; 139 public uint TimeStampTerse = 0;
140 140
141 [XmlIgnore] 141 [XmlIgnore]
142 public UUID FromAssetID = UUID.Zero; 142 public UUID FromItemID = UUID.Zero;
143 143
144 /// <value> 144 /// <value>
145 /// The UUID of the user inventory item from which this object was rezzed if this is a root part. 145 /// The UUID of the user inventory item from which this object was rezzed if this is a root part.
@@ -2389,7 +2389,7 @@ if (m_shape != null) {
2389 remoteClient.SendPrimitiveToClient(m_regionHandle, (ushort)(m_parentGroup.GetTimeDilation() * (float)ushort.MaxValue), LocalId, m_shape, 2389 remoteClient.SendPrimitiveToClient(m_regionHandle, (ushort)(m_parentGroup.GetTimeDilation() * (float)ushort.MaxValue), LocalId, m_shape,
2390 lPos, Velocity, Acceleration, RotationOffset, RotationalVelocity, clientFlags, m_uuid, _ownerID, 2390 lPos, Velocity, Acceleration, RotationOffset, RotationalVelocity, clientFlags, m_uuid, _ownerID,
2391 m_text, color, _parentID, m_particleSystem, m_clickAction, (byte)m_material, m_TextureAnimation, IsAttachment, 2391 m_text, color, _parentID, m_particleSystem, m_clickAction, (byte)m_material, m_TextureAnimation, IsAttachment,
2392 AttachmentPoint,FromAssetID, Sound, SoundGain, SoundFlags, SoundRadius); 2392 AttachmentPoint,FromItemID, Sound, SoundGain, SoundFlags, SoundRadius);
2393 } 2393 }
2394 2394
2395 /// <summary> 2395 /// <summary>
@@ -3767,7 +3767,7 @@ if (m_shape != null) {
3767 (ushort)(m_parentGroup.GetTimeDilation() * 3767 (ushort)(m_parentGroup.GetTimeDilation() *
3768 (float)ushort.MaxValue), LocalId, lPos, 3768 (float)ushort.MaxValue), LocalId, lPos,
3769 RotationOffset, Velocity, 3769 RotationOffset, Velocity,
3770 RotationalVelocity, state, FromAssetID, 3770 RotationalVelocity, state, FromItemID,
3771 OwnerID, (int)AttachmentPoint); 3771 OwnerID, (int)AttachmentPoint);
3772 } 3772 }
3773 3773