OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert "refactor: make llGiveInventory() use existing GetInventoryItem() method rather than iterate through TaskInventory itself." 

This reverts commit 58b13d51a7.
0.7.4.1
Justin Clark-Casey (justincc) 2012-07-17 22:56:21 +01:00
parent 356d597296
commit 59a29f5f22
1 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
View File

@ -3925,8 +3925,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
public void llGiveInventory(string destination, string inventory) public void llGiveInventory(string destination, string inventory)
{ {
m_host.AddScriptLPS(1); m_host.AddScriptLPS(1);
bool found = false;
UUID destId = UUID.Zero; UUID destId = UUID.Zero;
UUID objId = UUID.Zero;
int assetType = 0;
string objName = String.Empty;
if (!UUID.TryParse(destination, out destId)) if (!UUID.TryParse(destination, out destId))
{ {
@ -3934,16 +3937,28 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
return; return;
} }
TaskInventoryItem item = m_host.Inventory.GetInventoryItem(inventory); // move the first object found with this inventory name
lock (m_host.TaskInventory)
{
foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory)
{
if (inv.Value.Name == inventory)
{
found = true;
objId = inv.Key;
assetType = inv.Value.Type;
objName = inv.Value.Name;
break;
}
}
}
if (item == null) if (!found)
{ {
llSay(0, String.Format("Could not find object '{0}'", inventory)); llSay(0, String.Format("Could not find object '{0}'", inventory));
throw new Exception(String.Format("The inventory object '{0}' could not be found", inventory)); throw new Exception(String.Format("The inventory object '{0}' could not be found", inventory));
} }
UUID objId = item.ItemID;
// check if destination is an object // check if destination is an object
if (World.GetSceneObjectPart(destId) != null) if (World.GetSceneObjectPart(destId) != null)
{ {
@ -3974,7 +3989,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
return; return;
byte[] bucket = new byte[17]; byte[] bucket = new byte[17];
bucket[0] = (byte)item.Type; bucket[0] = (byte)assetType;
byte[] objBytes = agentItem.ID.GetBytes(); byte[] objBytes = agentItem.ID.GetBytes();
Array.Copy(objBytes, 0, bucket, 1, 16); Array.Copy(objBytes, 0, bucket, 1, 16);
@ -3982,15 +3997,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
m_host.UUID, m_host.Name+", an object owned by "+ m_host.UUID, m_host.Name+", an object owned by "+
resolveName(m_host.OwnerID)+",", destId, resolveName(m_host.OwnerID)+",", destId,
(byte)InstantMessageDialog.TaskInventoryOffered, (byte)InstantMessageDialog.TaskInventoryOffered,
false, item.Name + "\n" + m_host.Name + " is located at " + false, objName+"\n"+m_host.Name+" is located at "+
World.RegionInfo.RegionName+" "+ World.RegionInfo.RegionName+" "+
m_host.AbsolutePosition.ToString(), m_host.AbsolutePosition.ToString(),
agentItem.ID, true, m_host.AbsolutePosition, agentItem.ID, true, m_host.AbsolutePosition,
bucket); bucket);
if (m_TransferModule != null) if (m_TransferModule != null)
m_TransferModule.SendInstantMessage(msg, delegate(bool success) {}); m_TransferModule.SendInstantMessage(msg, delegate(bool success) {});
ScriptSleep(3000); ScriptSleep(3000);
} }
} }