aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/IClientAPI.cs44
1 files changed, 26 insertions, 18 deletions
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs
index 5bf0b7b..f573c32 100644
--- a/OpenSim/Framework/IClientAPI.cs
+++ b/OpenSim/Framework/IClientAPI.cs
@@ -570,16 +570,35 @@ namespace OpenSim.Framework
570 public float dwell; 570 public float dwell;
571 } 571 }
572 572
573 public class EntityUpdate 573 public class IEntityUpdate
574 { 574 {
575 public ISceneEntity Entity; 575 public ISceneEntity Entity;
576 public PrimUpdateFlags Flags; 576 public uint Flags;
577 public float TimeDilation;
578 577
579 public EntityUpdate(ISceneEntity entity, PrimUpdateFlags flags, float timedilation) 578 public virtual void Update(IEntityUpdate update)
579 {
580 this.Flags |= update.Flags;
581 }
582
583 public IEntityUpdate(ISceneEntity entity, uint flags)
580 { 584 {
581 Entity = entity; 585 Entity = entity;
582 Flags = flags; 586 Flags = flags;
587 }
588 }
589
590
591 public class EntityUpdate : IEntityUpdate
592 {
593 // public ISceneEntity Entity;
594 // public PrimUpdateFlags Flags;
595 public float TimeDilation;
596
597 public EntityUpdate(ISceneEntity entity, PrimUpdateFlags flags, float timedilation)
598 : base(entity,(uint)flags)
599 {
600 //Entity = entity;
601 // Flags = flags;
583 TimeDilation = timedilation; 602 TimeDilation = timedilation;
584 } 603 }
585 } 604 }
@@ -1211,20 +1230,9 @@ namespace OpenSim.Framework
1211 /// <param name="stats"></param> 1230 /// <param name="stats"></param>
1212 void SendSimStats(SimStats stats); 1231 void SendSimStats(SimStats stats);
1213 1232
1214 void SendObjectPropertiesFamilyData(uint RequestFlags, UUID ObjectUUID, UUID OwnerID, UUID GroupID, 1233 void SendObjectPropertiesFamilyData(ISceneEntity Entity, uint RequestFlags);
1215 uint BaseMask, uint OwnerMask, uint GroupMask, uint EveryoneMask, 1234
1216 uint NextOwnerMask, int OwnershipCost, byte SaleType, int SalePrice, 1235 void SendObjectPropertiesReply(ISceneEntity Entity);
1217 uint Category,
1218 UUID LastOwnerID, string ObjectName, string Description);
1219
1220 void SendObjectPropertiesReply(UUID ItemID, ulong CreationDate, UUID CreatorUUID, UUID FolderUUID,
1221 UUID FromTaskUUID,
1222 UUID GroupUUID, short InventorySerial, UUID LastOwnerUUID, UUID ObjectUUID,
1223 UUID OwnerUUID, string TouchTitle, byte[] TextureID, string SitTitle,
1224 string ItemName,
1225 string ItemDescription, uint OwnerMask, uint NextOwnerMask, uint GroupMask,
1226 uint EveryoneMask,
1227 uint BaseMask, byte saleType, int salePrice);
1228 1236
1229 void SendAgentOffline(UUID[] agentIDs); 1237 void SendAgentOffline(UUID[] agentIDs);
1230 1238