aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2010-08-23 23:16:48 +0100
committerJustin Clark-Casey (justincc)2010-08-23 23:16:48 +0100
commit704a53fb9bfeb945fa25f7367c631698dea5ae89 (patch)
tree532e4df3b07791e26f96d67be3f32614d9af052b /OpenSim/Region/ScriptEngine
parentRemove various warnings and improve logging messages. No functional changes. (diff)
downloadopensim-SC_OLD-704a53fb9bfeb945fa25f7367c631698dea5ae89.zip
opensim-SC_OLD-704a53fb9bfeb945fa25f7367c631698dea5ae89.tar.gz
opensim-SC_OLD-704a53fb9bfeb945fa25f7367c631698dea5ae89.tar.bz2
opensim-SC_OLD-704a53fb9bfeb945fa25f7367c631698dea5ae89.tar.xz
Fix bug in llGiveInventory() where items were disappearing on relog
This was a regression - the code to look up the correct type folder was no longer being called if items were added without a parent folder set This may have been broken since commit bd49985a on 2010-05-02
Diffstat (limited to 'OpenSim/Region/ScriptEngine')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs6
1 files changed, 2 insertions, 4 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index b6eddb1..dc43e45 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -3844,18 +3844,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3844 if (World.GetScenePresence(destId) != null) 3844 if (World.GetScenePresence(destId) != null)
3845 { 3845 {
3846 // destination is an avatar 3846 // destination is an avatar
3847 InventoryItemBase agentItem = 3847 InventoryItemBase agentItem = World.MoveTaskInventoryItem(destId, UUID.Zero, m_host, objId);
3848 World.MoveTaskInventoryItem(destId, UUID.Zero, m_host, objId);
3849 3848
3850 if (agentItem == null) 3849 if (agentItem == null)
3851 return; 3850 return;
3852 3851
3853 byte[] bucket = new byte[17]; 3852 byte[] bucket = new byte[17];
3854 bucket[0] = (byte)assetType; 3853 bucket[0] = (byte)assetType;
3855 byte[] objBytes = objId.GetBytes(); 3854 byte[] objBytes = agentItem.ID.GetBytes();
3856 Array.Copy(objBytes, 0, bucket, 1, 16); 3855 Array.Copy(objBytes, 0, bucket, 1, 16);
3857 3856
3858 Console.WriteLine("Giving inventory");
3859 GridInstantMessage msg = new GridInstantMessage(World, 3857 GridInstantMessage msg = new GridInstantMessage(World,
3860 m_host.UUID, m_host.Name+", an object owned by "+ 3858 m_host.UUID, m_host.Name+", an object owned by "+
3861 resolveName(m_host.OwnerID)+",", destId, 3859 resolveName(m_host.OwnerID)+",", destId,