From 69d014e1dcb0e05a4ec927a5501156627856bccb Mon Sep 17 00:00:00 2001
From: Mic Bowman
Date: Tue, 12 Apr 2011 12:36:36 -0700
Subject: First pass at moving object property requests into a queue similar to
 the entity update queue. The number of property packets can become
 significant when selecting/deselecting large numbers of objects.

This is experimental code.
---
 OpenSim/Framework/IClientAPI.cs | 39 +++++++++++++++++++++------------------
 1 file changed, 21 insertions(+), 18 deletions(-)

(limited to 'OpenSim/Framework/IClientAPI.cs')

diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs
index 5bf0b7b..c56a756 100644
--- a/OpenSim/Framework/IClientAPI.cs
+++ b/OpenSim/Framework/IClientAPI.cs
@@ -570,16 +570,30 @@ namespace OpenSim.Framework
         public float dwell;
     }
 
-    public class EntityUpdate
+    public class IEntityUpdate
     {
         public ISceneEntity Entity;
-        public PrimUpdateFlags Flags;
-        public float TimeDilation;
+        public uint Flags;
 
-        public EntityUpdate(ISceneEntity entity, PrimUpdateFlags flags, float timedilation)
+        public IEntityUpdate(ISceneEntity entity, uint flags)
         {
             Entity = entity;
             Flags = flags;
+        }
+    }
+    
+
+    public class EntityUpdate : IEntityUpdate
+    {
+        // public ISceneEntity Entity;
+        // public PrimUpdateFlags Flags;
+        public float TimeDilation;
+
+        public EntityUpdate(ISceneEntity entity, PrimUpdateFlags flags, float timedilation)
+            : base(entity,(uint)flags)
+        {
+            //Entity = entity;
+            // Flags = flags;
             TimeDilation = timedilation;
         }
     }
@@ -1211,20 +1225,9 @@ namespace OpenSim.Framework
         /// <param name="stats"></param>
         void SendSimStats(SimStats stats);
 
-        void SendObjectPropertiesFamilyData(uint RequestFlags, UUID ObjectUUID, UUID OwnerID, UUID GroupID,
-                                            uint BaseMask, uint OwnerMask, uint GroupMask, uint EveryoneMask,
-                                            uint NextOwnerMask, int OwnershipCost, byte SaleType, int SalePrice,
-                                            uint Category,
-                                            UUID LastOwnerID, string ObjectName, string Description);
-
-        void SendObjectPropertiesReply(UUID ItemID, ulong CreationDate, UUID CreatorUUID, UUID FolderUUID,
-                                       UUID FromTaskUUID,
-                                       UUID GroupUUID, short InventorySerial, UUID LastOwnerUUID, UUID ObjectUUID,
-                                       UUID OwnerUUID, string TouchTitle, byte[] TextureID, string SitTitle,
-                                       string ItemName,
-                                       string ItemDescription, uint OwnerMask, uint NextOwnerMask, uint GroupMask,
-                                       uint EveryoneMask,
-                                       uint BaseMask, byte saleType, int salePrice);
+        void SendObjectPropertiesFamilyData(ISceneEntity Entity, uint RequestFlags);
+
+        void SendObjectPropertiesReply(ISceneEntity Entity);
 
         void SendAgentOffline(UUID[] agentIDs);
 
-- 
cgit v1.1


From 78c04d61caed7dc62eb299a09148934d95a1c882 Mon Sep 17 00:00:00 2001
From: Mic Bowman
Date: Tue, 12 Apr 2011 15:40:57 -0700
Subject: Fixed the update of items in the priority queue to enable both types
 of property updates to be specified. Not sure if one form of property update
 should supercede another. But for now the old OpenSim behavior is preserved
 by sending both.

---
 OpenSim/Framework/IClientAPI.cs | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'OpenSim/Framework/IClientAPI.cs')

diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs
index c56a756..f573c32 100644
--- a/OpenSim/Framework/IClientAPI.cs
+++ b/OpenSim/Framework/IClientAPI.cs
@@ -575,6 +575,11 @@ namespace OpenSim.Framework
         public ISceneEntity Entity;
         public uint Flags;
 
+        public virtual void Update(IEntityUpdate update)
+        {
+            this.Flags |= update.Flags;
+        }
+
         public IEntityUpdate(ISceneEntity entity, uint flags)
         {
             Entity = entity;
-- 
cgit v1.1