diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Scene.Inventory.cs | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs index 3ce7955..1001fce 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs | |||
@@ -446,6 +446,8 @@ namespace OpenSim.Region.Environment.Scenes | |||
446 | sbyte assetType, | 446 | sbyte assetType, |
447 | byte wearableType, uint nextOwnerMask) | 447 | byte wearableType, uint nextOwnerMask) |
448 | { | 448 | { |
449 | // m_log.DebugFormat("[AGENT INVENTORY]: Received request to create inventory item {0} in folder {1}", name, folderID); | ||
450 | |||
449 | if (transactionID == LLUUID.Zero) | 451 | if (transactionID == LLUUID.Zero) |
450 | { | 452 | { |
451 | CachedUserInfo userInfo | 453 | CachedUserInfo userInfo |
@@ -731,12 +733,12 @@ namespace OpenSim.Region.Environment.Scenes | |||
731 | } | 733 | } |
732 | 734 | ||
733 | /// <summary> | 735 | /// <summary> |
734 | /// | 736 | /// Called when an object is removed from the environment into inventory. |
735 | /// </summary> | 737 | /// </summary> |
736 | /// <param name="packet"></param> | 738 | /// <param name="packet"></param> |
737 | /// <param name="simClient"></param> | 739 | /// <param name="simClient"></param> |
738 | public virtual void DeRezObject(Packet packet, IClientAPI remoteClient) | 740 | public virtual void DeRezObject(Packet packet, IClientAPI remoteClient) |
739 | { | 741 | { |
740 | DeRezObjectPacket DeRezPacket = (DeRezObjectPacket) packet; | 742 | DeRezObjectPacket DeRezPacket = (DeRezObjectPacket) packet; |
741 | 743 | ||
742 | if (DeRezPacket.AgentBlock.DestinationID == LLUUID.Zero) | 744 | if (DeRezPacket.AgentBlock.DestinationID == LLUUID.Zero) |
@@ -746,7 +748,11 @@ namespace OpenSim.Region.Environment.Scenes | |||
746 | else | 748 | else |
747 | { | 749 | { |
748 | foreach (DeRezObjectPacket.ObjectDataBlock Data in DeRezPacket.ObjectData) | 750 | foreach (DeRezObjectPacket.ObjectDataBlock Data in DeRezPacket.ObjectData) |
749 | { | 751 | { |
752 | // m_log.DebugFormat( | ||
753 | // "[AGENT INVENTORY]: Received request to derez {0} into folder {1}", | ||
754 | // Data.ObjectLocalID, DeRezPacket.AgentBlock.DestinationID); | ||
755 | |||
750 | EntityBase selectedEnt = null; | 756 | EntityBase selectedEnt = null; |
751 | //m_log.Info("[CLIENT]: LocalID:" + Data.ObjectLocalID.ToString()); | 757 | //m_log.Info("[CLIENT]: LocalID:" + Data.ObjectLocalID.ToString()); |
752 | 758 | ||
@@ -798,7 +804,11 @@ namespace OpenSim.Region.Environment.Scenes | |||
798 | remoteClient.SendInventoryItemCreateUpdate(item); | 804 | remoteClient.SendInventoryItemCreateUpdate(item); |
799 | } | 805 | } |
800 | 806 | ||
801 | DeleteSceneObjectGroup((SceneObjectGroup) selectedEnt); | 807 | // FIXME: Nasty hardcoding. If Destination is 1 then client wants us to take a copy |
808 | if (DeRezPacket.AgentBlock.Destination != 1) | ||
809 | { | ||
810 | DeleteSceneObjectGroup((SceneObjectGroup) selectedEnt); | ||
811 | } | ||
802 | } | 812 | } |
803 | } | 813 | } |
804 | } | 814 | } |