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

[Simian]

Browse Source 
* Partial implementation of RezScript
* Ported LSL to C# conversion code from OpenSim. Big thank you to all of the OpenSim contributors
* Moved Simian scripting code to a new folder

git-svn-id: http://libopenmetaverse.googlecode.com/svn/libopenmetaverse/trunk@2518 52acb1d6-8a22-11de-b505-999d5b087335
This commit is contained in:
John Hurliman
2009-03-20 00:19:32 +00:00
parent b8d7cdc027
commit 47c6034f9c
22 changed files with 31382 additions and 235 deletions
Download Patch File Download Diff File Expand all files Collapse all files

216
Programs/Simian/LLUDP/LLTaskInventory.cs
View File

@@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
using System.Text;
using System.Threading;
using ExtensionLoader;
using OpenMetaverse;
@@ -9,6 +10,8 @@ namespace Simian
{
public class LLTaskInventory : IExtension<ISceneProvider>
{
static readonly UUID DEFAULT_SCRIPT = new UUID("a7f70b8e-b2ee-46bb-85c0-5d973137cd47");
ISceneProvider scene;
public LLTaskInventory()
@@ -21,6 +24,7 @@ namespace Simian
scene.UDP.RegisterPacketCallback(PacketType.RequestTaskInventory, RequestTaskInventoryHandler);
scene.UDP.RegisterPacketCallback(PacketType.UpdateTaskInventory, UpdateTaskInventoryHandler);
scene.UDP.RegisterPacketCallback(PacketType.RezScript, RezScriptHandler);
scene.UDP.RegisterPacketCallback(PacketType.RemoveTaskInventory, RemoveTaskInventoryHandler);
scene.UDP.RegisterPacketCallback(PacketType.MoveTaskInventory, MoveTaskInventoryHandler);
return true;
@@ -54,101 +58,155 @@ namespace Simian
InventoryTaskItem item;
SimulationObject targetObj;
InventoryObject invObj;
if (update.UpdateData.Key == 0)
if (update.UpdateData.Key != 0)
{
if (scene.TryGetObject(update.UpdateData.LocalID, out targetObj))
Logger.Log("Got an UpdateTaskInventory packet with a Key of " + update.UpdateData.Key,
Helpers.LogLevel.Warning);
return;
}
if (scene.TryGetObject(update.UpdateData.LocalID, out targetObj))
{
if (update.InventoryData.ItemID != UUID.Zero)
{
if (targetObj.Inventory.TryGetItem(update.InventoryData.ItemID, out item))
{
// Updating an existing item in the task inventory
}
else if (scene.Server.Inventory.TryGetInventory(agent.ID, update.InventoryData.ItemID, out invObj))
{
// Create a new item in the task inventory
if (invObj is InventoryItem)
{
InventoryItem fromItem = (InventoryItem)invObj;
item = new InventoryTaskItem();
//item.ID will be assigned in AddOrUpdateItem
item.AssetID = fromItem.AssetID;
item.AssetType = fromItem.AssetType;
item.CreationDate = fromItem.CreationDate;
item.CreatorID = fromItem.CreatorID;
item.Description = fromItem.Description;
item.Flags = fromItem.Flags;
item.GrantedPermissions = 0;
item.GroupID = fromItem.GroupID;
item.GroupOwned = fromItem.GroupOwned;
item.InventoryType = fromItem.InventoryType;
item.Name = fromItem.Name;
item.OwnerID = agent.ID;
item.ParentID = update.InventoryData.FolderID;
item.Parent = null; // TODO: Try to find a parent folder in task inventory?
item.ParentObjectID = targetObj.Prim.ID;
item.PermissionGranter = UUID.Zero;
item.Permissions = fromItem.Permissions.GetNextPermissions();
item.SalePrice = fromItem.SalePrice;
item.SaleType = fromItem.SaleType;
bool allowDrop = (targetObj.Prim.Flags & PrimFlags.AllowInventoryDrop) != 0;
targetObj.Inventory.AddOrUpdateItem(item, false, allowDrop);
Logger.Log("Created new task inventory item: " + item.Name, Helpers.LogLevel.Info);
// Send an ObjectPropertiesReply to inform the client that inventory has changed
ObjectPropertiesPacket props = new ObjectPropertiesPacket();
props.ObjectData = new ObjectPropertiesPacket.ObjectDataBlock[1];
props.ObjectData[0] = new ObjectPropertiesPacket.ObjectDataBlock();
props.ObjectData[0].AggregatePerms = targetObj.Prim.Properties.AggregatePerms;
props.ObjectData[0].AggregatePermTextures = targetObj.Prim.Properties.AggregatePermTextures;
props.ObjectData[0].AggregatePermTexturesOwner = targetObj.Prim.Properties.AggregatePermTexturesOwner;
props.ObjectData[0].BaseMask = (uint)targetObj.Prim.Properties.Permissions.BaseMask;
props.ObjectData[0].Category = (uint)targetObj.Prim.Properties.Category;
props.ObjectData[0].CreationDate = Utils.DateTimeToUnixTime(targetObj.Prim.Properties.CreationDate);
props.ObjectData[0].CreatorID = targetObj.Prim.Properties.CreatorID;
props.ObjectData[0].Description = Utils.StringToBytes(targetObj.Prim.Properties.Description);
props.ObjectData[0].EveryoneMask = (uint)targetObj.Prim.Properties.Permissions.EveryoneMask;
props.ObjectData[0].FolderID = targetObj.Prim.Properties.FolderID;
props.ObjectData[0].FromTaskID = targetObj.Prim.Properties.FromTaskID;
props.ObjectData[0].GroupID = targetObj.Prim.Properties.GroupID;
props.ObjectData[0].GroupMask = (uint)targetObj.Prim.Properties.Permissions.GroupMask;
props.ObjectData[0].InventorySerial = targetObj.Prim.Properties.InventorySerial;
props.ObjectData[0].ItemID = targetObj.Prim.Properties.ItemID;
props.ObjectData[0].LastOwnerID = targetObj.Prim.Properties.LastOwnerID;
props.ObjectData[0].Name = Utils.StringToBytes(targetObj.Prim.Properties.Name);
props.ObjectData[0].NextOwnerMask = (uint)targetObj.Prim.Properties.Permissions.NextOwnerMask;
props.ObjectData[0].ObjectID = targetObj.Prim.ID;
props.ObjectData[0].OwnerID = targetObj.Prim.Properties.OwnerID;
props.ObjectData[0].OwnerMask = (uint)targetObj.Prim.Properties.Permissions.OwnerMask;
props.ObjectData[0].OwnershipCost = targetObj.Prim.Properties.OwnershipCost;
props.ObjectData[0].SalePrice = targetObj.Prim.Properties.SalePrice;
props.ObjectData[0].SaleType = (byte)targetObj.Prim.Properties.SaleType;
props.ObjectData[0].SitName = Utils.StringToBytes(targetObj.Prim.Properties.SitName);
props.ObjectData[0].TextureID = targetObj.Prim.Properties.GetTextureIDBytes();
props.ObjectData[0].TouchName = Utils.StringToBytes(targetObj.Prim.Properties.TouchName);
scene.UDP.SendPacket(agent.ID, props, PacketCategory.Transaction);
}
else
{
Logger.Log("[TODO] Handle dropping folders in task inventory", Helpers.LogLevel.Warning);
}
Logger.Log("[TODO] Implement updating task inventory items", Helpers.LogLevel.Error);
}
else
{
Logger.Log("Got an UpdateTaskInventory packet referencing an unknown inventory item", Helpers.LogLevel.Warning);
Logger.Log("UpdateTaskInventory for unknown inventory item " + update.InventoryData.ItemID, Helpers.LogLevel.Warning);
}
}
else if (scene.Server.Inventory.TryGetInventory(agent.ID, update.InventoryData.ItemID, out invObj))
{
// Create a new item in the task inventory
if (invObj is InventoryItem)
{
InventoryItem fromItem = (InventoryItem)invObj;
item = new InventoryTaskItem();
//item.ID will be assigned in AddOrUpdateItem
item.AssetID = fromItem.AssetID;
item.AssetType = fromItem.AssetType;
item.CreationDate = fromItem.CreationDate;
item.CreatorID = fromItem.CreatorID;
item.Description = fromItem.Description;
item.Flags = fromItem.Flags;
item.GrantedPermissions = 0;
item.GroupID = fromItem.GroupID;
item.GroupOwned = fromItem.GroupOwned;
item.InventoryType = fromItem.InventoryType;
item.Name = fromItem.Name;
item.OwnerID = agent.ID;
item.ParentID = update.InventoryData.FolderID;
item.Parent = null; // TODO: Try to find a parent folder in task inventory?
item.ParentObjectID = targetObj.Prim.ID;
item.PermissionGranter = UUID.Zero;
item.Permissions = fromItem.Permissions.GetNextPermissions();
item.SalePrice = fromItem.SalePrice;
item.SaleType = fromItem.SaleType;
bool allowDrop = (targetObj.Prim.Flags & PrimFlags.AllowInventoryDrop) != 0;
targetObj.Inventory.AddOrUpdateItem(item, false, allowDrop);
Logger.Log("Created new task inventory item: " + item.Name, Helpers.LogLevel.Info);
// Send an ObjectPropertiesReply to inform the client that inventory has changed
ObjectPropertiesPacket props = new ObjectPropertiesPacket();
props.ObjectData = new ObjectPropertiesPacket.ObjectDataBlock[1];
props.ObjectData[0] = SimulationObject.BuildPropertiesBlock(targetObj.Prim);
scene.UDP.SendPacket(agent.ID, props, PacketCategory.Transaction);
}
else
{
Logger.Log("[TODO] Handle dropping folders in task inventory", Helpers.LogLevel.Warning);
}
}
else
{
Logger.Log("Got an UpdateTaskInventory packet referencing an unknown object", Helpers.LogLevel.Warning);
Logger.Log("Got an UpdateTaskInventory packet referencing an unknown inventory item", Helpers.LogLevel.Warning);
}
}
else
{
Logger.Log("Got an UpdateTaskInventory packet with a Key of " + update.UpdateData.Key, Helpers.LogLevel.Warning);
Logger.Log("Got an UpdateTaskInventory packet referencing an unknown object", Helpers.LogLevel.Warning);
}
}
void RezScriptHandler(Packet packet, Agent agent)
{
RezScriptPacket rez = (RezScriptPacket)packet;
InventoryTaskItem scriptItem;
SimulationObject targetObj;
InventoryObject invObj;
if (scene.TryGetObject(rez.UpdateBlock.ObjectLocalID, out targetObj))
{
if (rez.InventoryBlock.ItemID != UUID.Zero)
{
if (scene.Server.Inventory.TryGetInventory(agent.ID, rez.InventoryBlock.ItemID, out invObj))
{
// Rezzing a script from agent inventory
Asset defaultScript;
if (scene.Server.Assets.TryGetAsset(DEFAULT_SCRIPT, out defaultScript))
{
Logger.Log("[TODO] RezScript from agent inventory", Helpers.LogLevel.Error);
}
}
else
{
Logger.Log("RezScript for unknown inventory item " + rez.InventoryBlock.ItemID, Helpers.LogLevel.Warning);
}
}
else
{
// Rezzing a new script
scriptItem = new InventoryTaskItem();
scriptItem.AssetID = DEFAULT_SCRIPT;
scriptItem.AssetType = AssetType.LSLText;
scriptItem.CreationDate = DateTime.Now;
scriptItem.CreatorID = agent.ID;
scriptItem.Description = String.Empty;
scriptItem.Flags = 0;
scriptItem.GrantedPermissions = 0;
scriptItem.GroupID = UUID.Zero;
scriptItem.GroupOwned = false;
scriptItem.ID = UUID.Random();
scriptItem.InventoryType = InventoryType.LSL;
scriptItem.Name = "New script";
scriptItem.OwnerID = agent.ID;
scriptItem.ParentID = rez.InventoryBlock.FolderID;
scriptItem.Parent = null; // TODO: Try to find a parent folder in task inventory?
scriptItem.ParentObjectID = targetObj.Prim.ID;
scriptItem.PermissionGranter = UUID.Zero;
scriptItem.Permissions = scene.Server.Permissions.GetDefaultPermissions();
scriptItem.SalePrice = 10;
scriptItem.SaleType = SaleType.Not;
targetObj.Inventory.AddOrUpdateItem(scriptItem, false, false);
Logger.Log("Created new task inventory script: " + scriptItem.Name, Helpers.LogLevel.Info);
// Send an ObjectPropertiesReply to inform the client that inventory has changed
ObjectPropertiesPacket props = new ObjectPropertiesPacket();
props.ObjectData = new ObjectPropertiesPacket.ObjectDataBlock[1];
props.ObjectData[0] = SimulationObject.BuildPropertiesBlock(targetObj.Prim);
scene.UDP.SendPacket(agent.ID, props, PacketCategory.Transaction);
// Mark this object as scripted
targetObj.Prim.Flags |= PrimFlags.Scripted;
scene.ObjectAddOrUpdate(this, targetObj, targetObj.Prim.OwnerID, PrimFlags.None, UpdateFlags.PrimFlags);
// Run the script
scene.ScriptEngine.RezScript(scriptItem.ID, scriptItem.AssetID, targetObj, 0);
}
}
else
{
Logger.Log("Got a RezScript packet referencing an unknown object", Helpers.LogLevel.Warning);
}
}