* 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

View File

@@ -74,11 +74,11 @@ namespace Simian.Extensions
if (parcels.TryGetValue(parcelOverlay[y * 64 + x], out parcel))
{
// Set the ownership/sale flag
if (parcel.OwnerID == agent.Avatar.ID)
if (parcel.OwnerID == agent.ID)
tempByte = (byte)ParcelOverlayType.OwnedBySelf;
else if (parcel.AuctionID != 0)
tempByte = (byte)ParcelOverlayType.Auction;
else if (parcel.SalePrice > 0 && (parcel.AuthBuyerID == UUID.Zero || parcel.AuthBuyerID == agent.Avatar.ID))
else if (parcel.SalePrice > 0 && (parcel.AuthBuyerID == UUID.Zero || parcel.AuthBuyerID == agent.ID))
tempByte = (byte)ParcelOverlayType.ForSale;
else if (parcel.GroupID != UUID.Zero)
tempByte = (byte)ParcelOverlayType.OwnedByGroup;
@@ -108,7 +108,7 @@ namespace Simian.Extensions
ParcelOverlayPacket overlay = new ParcelOverlayPacket();
overlay.ParcelData.SequenceID = sequenceID;
overlay.ParcelData.Data = byteArray;
server.UDP.SendPacket(agent.Avatar.ID, overlay, PacketCategory.State);
server.UDP.SendPacket(agent.ID, overlay, PacketCategory.State);
byteArrayCount = 0;
++sequenceID;
@@ -215,9 +215,9 @@ namespace Simian.Extensions
properties.ParcelData.UserLookAt = parcel.UserLookAt;
// HACK: Make everyone think they are the owner of this parcel
properties.ParcelData.OwnerID = agent.Avatar.ID;
properties.ParcelData.OwnerID = agent.ID;
server.UDP.SendPacket(agent.Avatar.ID, properties, PacketCategory.Transaction);
server.UDP.SendPacket(agent.ID, properties, PacketCategory.Transaction);
}
else
{