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

refactor: replace use of LSL_Api.GetTaskInventoryItem() with existing GetInventoryItem()

0.7.3-extended
Justin Clark-Casey (justincc) 2012-07-04 21:33:35 +01:00
parent 72554fc5b8
commit 0acac2f890
1 changed files with 11 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6138,20 +6138,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
} }
} }
protected UUID GetTaskInventoryItem(string name)
{
lock (m_host.TaskInventory)
{
foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory)
{
if (inv.Value.Name == name)
return inv.Key;
}
}
return UUID.Zero;
}
public void llGiveInventoryList(string destination, string category, LSL_List inventory) public void llGiveInventoryList(string destination, string category, LSL_List inventory)
{ {
m_host.AddScriptLPS(1); m_host.AddScriptLPS(1);
@ -6164,16 +6150,19 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
foreach (Object item in inventory.Data) foreach (Object item in inventory.Data)
{ {
string rawItemString = item.ToString();
UUID itemID; UUID itemID;
if (UUID.TryParse(item.ToString(), out itemID)) if (UUID.TryParse(rawItemString, out itemID))
{ {
itemList.Add(itemID); itemList.Add(itemID);
} }
else else
{ {
itemID = GetTaskInventoryItem(item.ToString()); TaskInventoryItem taskItem = m_host.Inventory.GetInventoryItem(rawItemString);
if (itemID != UUID.Zero)
itemList.Add(itemID); if (taskItem != null)
itemList.Add(taskItem.ItemID);
} }
} }
@ -6191,11 +6180,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
Array.Copy(objBytes, 0, bucket, 1, 16); Array.Copy(objBytes, 0, bucket, 1, 16);
GridInstantMessage msg = new GridInstantMessage(World, GridInstantMessage msg = new GridInstantMessage(World,
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.InventoryOffered, (byte)InstantMessageDialog.InventoryOffered,
false, category+"\n"+m_host.Name+" is located at "+ false, category + "\n" + m_host.Name + " is located at " +
World.RegionInfo.RegionName+" "+ World.RegionInfo.RegionName + " " +
m_host.AbsolutePosition.ToString(), m_host.AbsolutePosition.ToString(),
folderID, true, m_host.AbsolutePosition, folderID, true, m_host.AbsolutePosition,
bucket); bucket);