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

59
Programs/Simian/Extensions/SceneManager.cs
View File

@@ -364,24 +364,10 @@ namespace Simian
public bool ObjectRemove(object sender, uint localID)
{
SimulationObject obj;
Agent agent;
if (sceneObjects.TryGetValue(localID, out obj))
{
if (sceneAgents.TryGetValue(obj.Prim.ID, out agent))
AgentRemove(sender, agent);
if (OnObjectRemove != null)
OnObjectRemove(sender, obj);
sceneObjects.Remove(obj.Prim.LocalID, obj.Prim.ID);
KillObjectPacket kill = new KillObjectPacket();
kill.ObjectData = new KillObjectPacket.ObjectDataBlock[1];
kill.ObjectData[0] = new KillObjectPacket.ObjectDataBlock();
kill.ObjectData[0].ID = obj.Prim.LocalID;
udp.BroadcastPacket(kill, PacketCategory.State);
RemoveObject(sender, obj);
return true;
}
@@ -391,24 +377,10 @@ namespace Simian
public bool ObjectRemove(object sender, UUID id)
{
SimulationObject obj;
Agent agent;
if (sceneObjects.TryGetValue(id, out obj))
{
if (sceneAgents.TryGetValue(id, out agent))
AgentRemove(sender, agent);
if (OnObjectRemove != null)
OnObjectRemove(sender, obj);
sceneObjects.Remove(obj.Prim.LocalID, obj.Prim.ID);
KillObjectPacket kill = new KillObjectPacket();
kill.ObjectData = new KillObjectPacket.ObjectDataBlock[1];
kill.ObjectData[0] = new KillObjectPacket.ObjectDataBlock();
kill.ObjectData[0].ID = obj.Prim.LocalID;
udp.BroadcastPacket(kill, PacketCategory.State);
RemoveObject(sender, obj);
return true;
}
@@ -1377,6 +1349,33 @@ namespace Simian
}
}
void RemoveObject(object sender, SimulationObject obj)
{
// If this object has an agent associated with it, remove the agent from the scene as well
Agent agent;
if (sceneAgents.TryGetValue(obj.Prim.ID, out agent))
AgentRemove(sender, agent);
// Remove the agent from the scene
sceneObjects.Remove(obj.Prim.LocalID, obj.Prim.ID);
// Fire the callback
if (OnObjectRemove != null)
OnObjectRemove(sender, obj);
// If this object has a cached task inventory asset, delete it now
if (obj.Inventory.InventorySerial > 0)
taskInventory.RemoveTaskFile(obj.Inventory.GetInventoryFilename());
// Broadcast the kill message
KillObjectPacket kill = new KillObjectPacket();
kill.ObjectData = new KillObjectPacket.ObjectDataBlock[1];
kill.ObjectData[0] = new KillObjectPacket.ObjectDataBlock();
kill.ObjectData[0].ID = obj.Prim.LocalID;
udp.BroadcastPacket(kill, PacketCategory.State);
}
void SendObjectPacket(SimulationObject obj, bool canUseCompressed, bool canUseImproved, PrimFlags creatorFlags, UpdateFlags updateFlags)
{
if (!canUseImproved && !canUseCompressed)