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

[Simian]

Browse Source 
* Clearing up confusion with Agent.Avatar by making it a SimulationObject that is passed in through the constructor. This should prevent duplicate notions of an avatar in the scene
* Fixed the "you don't own this object" issue after moving a prim. The fix is rather hacky and will be replaced when we stop sending full object updates for every change

git-svn-id: http://libopenmetaverse.googlecode.com/svn/libopenmetaverse/trunk@2465 52acb1d6-8a22-11de-b505-999d5b087335
This commit is contained in:
John Hurliman
2009-03-03 21:01:57 +00:00
parent c8312a0777
commit 871ffb42a6
27 changed files with 429 additions and 417 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Programs/Simian/Extensions/TransferManager.cs
View File

@@ -60,7 +60,7 @@ namespace Simian.Extensions
complete.AssetBlock.Success = true;
complete.AssetBlock.Type = request.AssetBlock.Type;
complete.AssetBlock.UUID = assetID;
server.UDP.SendPacket(agent.Avatar.ID, complete, PacketCategory.Inventory);
server.UDP.SendPacket(agent.ID, complete, PacketCategory.Inventory);
}
else
{
@@ -89,7 +89,7 @@ namespace Simian.Extensions
lock (CurrentUploads)
CurrentUploads[xfer.XferID.ID] = asset;
server.UDP.SendPacket(agent.Avatar.ID, xfer, PacketCategory.Inventory);
server.UDP.SendPacket(agent.ID, xfer, PacketCategory.Inventory);
}
}
@@ -118,7 +118,7 @@ namespace Simian.Extensions
ConfirmXferPacketPacket confirm = new ConfirmXferPacketPacket();
confirm.XferID.ID = xfer.XferID.ID;
confirm.XferID.Packet = xfer.XferID.Packet;
server.UDP.SendPacket(agent.Avatar.ID, confirm, PacketCategory.Asset);
server.UDP.SendPacket(agent.ID, confirm, PacketCategory.Asset);
}
else
{
@@ -129,7 +129,7 @@ namespace Simian.Extensions
ConfirmXferPacketPacket confirm = new ConfirmXferPacketPacket();
confirm.XferID.ID = xfer.XferID.ID;
confirm.XferID.Packet = xfer.XferID.Packet;
server.UDP.SendPacket(agent.Avatar.ID, confirm, PacketCategory.Asset);
server.UDP.SendPacket(agent.ID, confirm, PacketCategory.Asset);
if ((xfer.XferID.Packet & (uint)0x80000000) != 0)
{
@@ -145,7 +145,7 @@ namespace Simian.Extensions
complete.AssetBlock.Success = true;
complete.AssetBlock.Type = (sbyte)asset.AssetType;
complete.AssetBlock.UUID = asset.AssetID;
server.UDP.SendPacket(agent.Avatar.ID, complete, PacketCategory.Asset);
server.UDP.SendPacket(agent.ID, complete, PacketCategory.Asset);
}
}
}
@@ -221,7 +221,7 @@ namespace Simian.Extensions
response.TransferInfo.Status = (int)StatusCode.OK;
response.TransferInfo.TargetType = (int)TargetType.Unknown; // Doesn't seem to be used by the client
server.UDP.SendPacket(agent.Avatar.ID, response, PacketCategory.Asset);
server.UDP.SendPacket(agent.ID, response, PacketCategory.Asset);
// Transfer system does not wait for ACKs, just sends all of the
// packets for this transfer out
@@ -245,7 +245,7 @@ namespace Simian.Extensions
else
transfer.TransferData.Status = (int)StatusCode.OK;
server.UDP.SendPacket(agent.Avatar.ID, transfer, PacketCategory.Asset);
server.UDP.SendPacket(agent.ID, transfer, PacketCategory.Asset);
}
}
else
@@ -265,7 +265,7 @@ namespace Simian.Extensions
response.TransferInfo.Status = (int)StatusCode.UnknownSource;
response.TransferInfo.TargetType = (int)TargetType.Unknown;
server.UDP.SendPacket(agent.Avatar.ID, response, PacketCategory.Asset);
server.UDP.SendPacket(agent.ID, response, PacketCategory.Asset);
}
}
else if (source == SourceType.SimEstate)