*Fixed bug that incorrectly tabulated 'others' prims on a parcel

*Added support for selected prims (does not yet support prims being sat on)
*Added support for listing avatars with prims on parcel with their prim count

2 files changed, 6 insertions, 2 deletions

diff --git a/OpenSim/Framework/General/Interfaces/IClientAPI.cs b/OpenSim/Framework/General/Interfaces/IClientAPI.cs
index 4c6a0e0..bd258a3 100644
--- a/OpenSim/Framework/General/Interfaces/IClientAPI.cs
+++ b/OpenSim/Framework/General/Interfaces/IClientAPI.cs
@@ -54,6 +54,7 @@ namespace OpenSim.Framework.Interfaces
 

     public delegate void UpdateShape(uint localID, ObjectShapePacket.ObjectDataBlock shapeBlock);

     public delegate void ObjectSelect(uint localID, IClientAPI remoteClient);

+    public delegate void ObjectDeselect(uint localID, IClientAPI remoteClient);

     public delegate void UpdatePrimFlags(uint localID, Packet packet, IClientAPI remoteClient);

     public delegate void UpdatePrimTexture(uint localID, byte[] texture, IClientAPI remoteClient);

     public delegate void UpdateVector(uint localID, LLVector3 pos, IClientAPI remoteClient);

@@ -71,7 +72,7 @@ namespace OpenSim.Framework.Interfaces
     public delegate void ParcelJoinRequest(int west, int south, int east, int north, IClientAPI remote_client);

     public delegate void ParcelPropertiesUpdateRequest(ParcelPropertiesUpdatePacket packet, IClientAPI remote_client);

     public delegate void ParcelSelectObjects(int parcel_local_id, int request_type, IClientAPI remote_client);

-

+    public delegate void ParcelObjectOwnerRequest(int local_id, IClientAPI remote_client);

     public delegate void EstateOwnerMessageRequest(EstateOwnerMessagePacket packet, IClientAPI remote_client);

 

     public delegate void UUIDNameRequest(LLUUID id, IClientAPI remote_client);

@@ -106,6 +107,7 @@ namespace OpenSim.Framework.Interfaces
 

         event UpdateShape OnUpdatePrimShape;

         event ObjectSelect OnObjectSelect;

+        event ObjectDeselect OnObjectDeselect;

         event GenericCall7 OnObjectDescription;

         event GenericCall7 OnObjectName;

         event UpdatePrimFlags OnUpdatePrimFlags;

@@ -128,7 +130,7 @@ namespace OpenSim.Framework.Interfaces
         event ParcelJoinRequest OnParcelJoinRequest;

         event ParcelPropertiesUpdateRequest OnParcelPropertiesUpdateRequest;

         event ParcelSelectObjects OnParcelSelectObjects;

-

+        event ParcelObjectOwnerRequest OnParcelObjectOwnerRequest;

         event EstateOwnerMessageRequest OnEstateOwnerMessage;

 

         LLVector3 StartPos

diff --git a/OpenSim/Framework/General/Types/ParcelData.cs b/OpenSim/Framework/General/Types/ParcelData.cs
index 80b9b64..17de655 100644
--- a/OpenSim/Framework/General/Types/ParcelData.cs
+++ b/OpenSim/Framework/General/Types/ParcelData.cs
@@ -49,6 +49,7 @@ namespace OpenSim.Framework.Types
             public int groupPrims = 0;

             public int otherPrims = 0;

             public int ownerPrims = 0;

+            public int selectedPrims = 0;

             public int simwidePrims = 0;

             public int simwideArea = 0;

             public int salePrice = 0; //Unemeplemented. Parcels price.

@@ -90,6 +91,7 @@ namespace OpenSim.Framework.Types
                 parcelData.groupPrims = this.groupPrims;

                 parcelData.otherPrims = this.otherPrims;

                 parcelData.ownerPrims = this.ownerPrims;

+                parcelData.selectedPrims = this.selectedPrims;

                 parcelData.isGroupOwned = this.isGroupOwned;

                 parcelData.localID = this.localID;

                 parcelData.landingType = this.landingType;