1 files changed, 26 insertions, 18 deletions

diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs
index 2f35a6c..eea9107 100644
--- a/OpenSim/Framework/IClientAPI.cs
+++ b/OpenSim/Framework/IClientAPI.cs
@@ -574,16 +574,35 @@ 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 virtual void Update(IEntityUpdate update)
+        {
+            this.Flags |= update.Flags;
+        }
+
+        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;
         }
     }
@@ -1217,20 +1236,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);