*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, 20 insertions, 1 deletions

diff --git a/OpenSim/Region/ClientStack/ClientView.API.cs b/OpenSim/Region/ClientStack/ClientView.API.cs
index cf0e294..33e34c1 100644
--- a/OpenSim/Region/ClientStack/ClientView.API.cs
+++ b/OpenSim/Region/ClientStack/ClientView.API.cs
@@ -61,6 +61,7 @@ namespace OpenSim.Region.ClientStack
         public event AddNewPrim OnAddPrim;

         public event UpdateShape OnUpdatePrimShape;

         public event ObjectSelect OnObjectSelect;

+        public event ObjectDeselect OnObjectDeselect;

         public event GenericCall7 OnObjectDescription;

         public event GenericCall7 OnObjectName;

         public event UpdatePrimFlags OnUpdatePrimFlags;

@@ -85,7 +86,7 @@ namespace OpenSim.Region.ClientStack
         public event ParcelJoinRequest OnParcelJoinRequest;

         public event ParcelPropertiesUpdateRequest OnParcelPropertiesUpdateRequest;

         public event ParcelSelectObjects OnParcelSelectObjects;

-

+        public event ParcelObjectOwnerRequest OnParcelObjectOwnerRequest;

         public event EstateOwnerMessageRequest OnEstateOwnerMessage;

 

         /// <summary>

diff --git a/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs b/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs
index 37591d9..a8512a7 100644
--- a/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs
+++ b/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs
@@ -279,6 +279,16 @@ namespace OpenSim.Region.ClientStack
                             }

                         }

                         break;

+                    case PacketType.ObjectDeselect:

+                        ObjectDeselectPacket incomingdeselect = (ObjectDeselectPacket)Pack;

+                        for (int i = 0; i < incomingdeselect.ObjectData.Length; i++)

+                        {

+                            if (OnObjectDeselect != null)

+                            {

+                                OnObjectDeselect(incomingdeselect.ObjectData[i].ObjectLocalID, this);

+                            }

+                        }

+                        break;

                     case PacketType.ObjectFlagUpdate:

                         ObjectFlagUpdatePacket flags = (ObjectFlagUpdatePacket)Pack;

                         if (OnUpdatePrimFlags != null)

@@ -601,6 +611,14 @@ namespace OpenSim.Region.ClientStack
                             OnParcelSelectObjects(selectPacket.ParcelData.LocalID, Convert.ToInt32(selectPacket.ParcelData.ReturnType), this);

                         }

                         break;

+

+                    case PacketType.ParcelObjectOwnersRequest:

+                        ParcelObjectOwnersRequestPacket reqPacket = (ParcelObjectOwnersRequestPacket)Pack;

+                        if (OnParcelObjectOwnerRequest != null)

+                        {

+                            OnParcelObjectOwnerRequest(reqPacket.ParcelData.LocalID, this);

+                        }

+                        break;

                     #endregion

 

                     #region Estate Packets