Miko/libremetaverse
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Added InventoryItemFlags, which is actually only the upper half of the Flags field for inventory items. Stores slam bits, permission override flags, and other things we don't use at all right now

Browse Source 
[Simian]
* Initial task inventory support. Move, remove, and RezScript are not supported yet
* SimulationObject Frozen and RotationAxis properties now point to the root prim in the linkset

git-svn-id: http://libopenmetaverse.googlecode.com/svn/libopenmetaverse/trunk@2503 52acb1d6-8a22-11de-b505-999d5b087335
This commit is contained in:
John Hurliman
2009-03-19 00:25:03 +00:00
parent 59d048fe33
commit c20afbbf80
13 changed files with 754 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
Programs/Simian/ScriptApi.cs
View File

@@ -1857,7 +1857,7 @@ namespace Simian
}
if ((item != null &&
scene.TaskInventory.TryGetAsset(hostObject.Prim.ID, item.AssetID, out asset) &&
scene.Server.Assets.TryGetAsset(item.AssetID, out asset) &&
asset is AssetPrim &&
scene.Server.Assets.TryDecodePrimAsset(((AssetPrim)asset).AssetData, out newLinkset)) ||
newLinkset != null)
@@ -2362,10 +2362,8 @@ namespace Simian
{
hostObject.AddScriptLPS(1);
InventoryTaskItem scriptItem = scene.TaskInventory.FindItem(hostObject.Prim.ID,
delegate(InventoryTaskItem item) { return item.ID == scriptID; });
if (scriptItem != null)
InventoryTaskItem scriptItem;
if (hostObject.Inventory.TryGetItem(scriptID, out scriptItem))
return scriptItem.PermissionGranter.ToString();
else
return LSL_Key.Zero;
@@ -2375,12 +2373,10 @@ namespace Simian
{
hostObject.AddScriptLPS(1);
InventoryTaskItem scriptItem = scene.TaskInventory.FindItem(hostObject.Prim.ID,
delegate(InventoryTaskItem item) { return item.ID == scriptID; });
uint perms = 0;
if (scriptItem != null)
InventoryTaskItem scriptItem;
if (hostObject.Inventory.TryGetItem(scriptID, out scriptItem))
{
perms = scriptItem.GrantedPermissions;
if (automaticLinkPermission)
@@ -2499,7 +2495,7 @@ namespace Simian
hostObject.AddScriptLPS(1);
int count = 0;
scene.TaskInventory.ForEachItem(hostObject.Prim.ID,
hostObject.Inventory.ForEachItem(
delegate(InventoryTaskItem item)
{
if (type == -1 || (int)item.AssetType == type)
@@ -4520,10 +4516,8 @@ namespace Simian
{
hostObject.AddScriptLPS(1);
InventoryTaskItem findItem = scene.TaskInventory.FindItem(hostObject.Prim.ID,
delegate(InventoryTaskItem item) { return item.Name == itemName; });
if (findItem != null)
InventoryTaskItem findItem;
if (hostObject.Inventory.TryGetItem(itemName, out findItem))
{
switch (mask)
{
@@ -5103,15 +5097,17 @@ namespace Simian
private InventoryTaskItem InventorySelf()
{
hostObject.AddScriptLPS(1);
return scene.TaskInventory.FindItem(hostObject.Prim.ID,
delegate(InventoryTaskItem item) { return item.AssetID == scriptID; });
InventoryTaskItem self;
hostObject.Inventory.TryGetItem(scriptID, out self);
return self;
}
private InventoryTaskItem InventoryKey(string name, AssetType type)
{
hostObject.AddScriptLPS(1);
return scene.TaskInventory.FindItem(hostObject.Prim.ID,
return hostObject.Inventory.FindItem(
delegate(InventoryTaskItem item) { return item.AssetType == type && item.Name == name; });
}
@@ -5119,8 +5115,9 @@ namespace Simian
{
hostObject.AddScriptLPS(1);
return scene.TaskInventory.FindItem(hostObject.Prim.ID,
delegate(InventoryTaskItem item) { return item.Name == name; });
InventoryTaskItem item;
hostObject.Inventory.TryGetItem(name, out item);
return item;
}
/// <summary>
@@ -5151,10 +5148,11 @@ namespace Simian
UUID ScriptByName(string name)
{
InventoryTaskItem scriptItem = scene.TaskInventory.FindItem(hostObject.Prim.ID,
delegate(InventoryTaskItem item) { return item.AssetType == AssetType.LSLText && item.Name == name; });
return (scriptItem != null) ? scriptItem.ID : UUID.Zero;
InventoryTaskItem scriptItem;
if (hostObject.Inventory.TryGetItem(name, out scriptItem) && scriptItem.AssetType == AssetType.LSLText)
return scriptItem.ID;
else
return UUID.Zero;
}
void ShoutError(string msg)