aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authorMic Bowman2011-04-12 12:36:36 -0700
committerMic Bowman2011-04-12 12:36:36 -0700
commit095e602c4ac6da315f3f6711e24f034b6c490a02 (patch)
tree3d9d7dba1eda4184efed5293e6e7e0c7ada81e21 /OpenSim/Framework
parentNew tokenbucket algorithm. This one provides fair sharing of the queues (diff)
downloadopensim-SC_OLD-095e602c4ac6da315f3f6711e24f034b6c490a02.zip
opensim-SC_OLD-095e602c4ac6da315f3f6711e24f034b6c490a02.tar.gz
opensim-SC_OLD-095e602c4ac6da315f3f6711e24f034b6c490a02.tar.bz2
opensim-SC_OLD-095e602c4ac6da315f3f6711e24f034b6c490a02.tar.xz
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.
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/IClientAPI.cs39
1 files changed, 21 insertions, 18 deletions
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
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 IEntityUpdate(ISceneEntity entity, uint flags)
580 { 579 {
581 Entity = entity; 580 Entity = entity;
582 Flags = flags; 581 Flags = flags;
582 }
583 }
584
585
586 public class EntityUpdate : IEntityUpdate
587 {
588 // public ISceneEntity Entity;
589 // public PrimUpdateFlags Flags;
590 public float TimeDilation;
591
592 public EntityUpdate(ISceneEntity entity, PrimUpdateFlags flags, float timedilation)
593 : base(entity,(uint)flags)
594 {
595 //Entity = entity;
596 // Flags = flags;
583 TimeDilation = timedilation; 597 TimeDilation = timedilation;
584 } 598 }
585 } 599 }
@@ -1211,20 +1225,9 @@ namespace OpenSim.Framework
1211 /// <param name="stats"></param> 1225 /// <param name="stats"></param>
1212 void SendSimStats(SimStats stats); 1226 void SendSimStats(SimStats stats);
1213 1227
1214 void SendObjectPropertiesFamilyData(uint RequestFlags, UUID ObjectUUID, UUID OwnerID, UUID GroupID, 1228 void SendObjectPropertiesFamilyData(ISceneEntity Entity, uint RequestFlags);
1215 uint BaseMask, uint OwnerMask, uint GroupMask, uint EveryoneMask, 1229
1216 uint NextOwnerMask, int OwnershipCost, byte SaleType, int SalePrice, 1230 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 1231
1229 void SendAgentOffline(UUID[] agentIDs); 1232 void SendAgentOffline(UUID[] agentIDs);
1230 1233