diff options
author | John Hurliman | 2009-10-17 18:01:22 -0700 |
---|---|---|
committer | John Hurliman | 2009-10-17 18:01:22 -0700 |
commit | fdb2a75ad357668b860fc5055e0630ef75a3ad20 (patch) | |
tree | df5e554df0215f43fa82acecef7c2df660807bdd /OpenSim/Framework | |
parent | Wrapped the contents of the IncomingPacketHandler loop in a try/catch statement (diff) | |
download | opensim-SC-fdb2a75ad357668b860fc5055e0630ef75a3ad20.zip opensim-SC-fdb2a75ad357668b860fc5055e0630ef75a3ad20.tar.gz opensim-SC-fdb2a75ad357668b860fc5055e0630ef75a3ad20.tar.bz2 opensim-SC-fdb2a75ad357668b860fc5055e0630ef75a3ad20.tar.xz |
Committing the second part of Jim Greensky @ Intel Lab's patch, re-prioritizing updates
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r-- | OpenSim/Framework/IClientAPI.cs | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs index 9aa3af1..03e7a25 100644 --- a/OpenSim/Framework/IClientAPI.cs +++ b/OpenSim/Framework/IClientAPI.cs | |||
@@ -448,6 +448,8 @@ namespace OpenSim.Framework | |||
448 | public delegate void AvatarInterestUpdate(IClientAPI client, uint wantmask, string wanttext, uint skillsmask, string skillstext, string languages); | 448 | public delegate void AvatarInterestUpdate(IClientAPI client, uint wantmask, string wanttext, uint skillsmask, string skillstext, string languages); |
449 | public delegate void PlacesQuery(UUID QueryID, UUID TransactionID, string QueryText, uint QueryFlags, byte Category, string SimName, IClientAPI client); | 449 | public delegate void PlacesQuery(UUID QueryID, UUID TransactionID, string QueryText, uint QueryFlags, byte Category, string SimName, IClientAPI client); |
450 | 450 | ||
451 | public delegate double UpdatePriorityHandler(UpdatePriorityData data); | ||
452 | |||
451 | #endregion | 453 | #endregion |
452 | 454 | ||
453 | public struct DirPlacesReplyData | 455 | public struct DirPlacesReplyData |
@@ -744,6 +746,29 @@ namespace OpenSim.Framework | |||
744 | public double priority { get { return this.m_priority; } } | 746 | public double priority { get { return this.m_priority; } } |
745 | } | 747 | } |
746 | 748 | ||
749 | public struct UpdatePriorityData { | ||
750 | private double m_priority; | ||
751 | private uint m_localID; | ||
752 | |||
753 | public UpdatePriorityData(double priority, uint localID) { | ||
754 | this.m_priority = priority; | ||
755 | this.m_localID = localID; | ||
756 | } | ||
757 | |||
758 | public double priority { get { return this.m_priority; } } | ||
759 | public uint localID { get { return this.m_localID; } } | ||
760 | } | ||
761 | |||
762 | [Flags] | ||
763 | public enum StateUpdateTypes | ||
764 | { | ||
765 | None = 0, | ||
766 | AvatarTerse = 1, | ||
767 | PrimitiveTerse = AvatarTerse << 1, | ||
768 | PrimitiveFull = PrimitiveTerse << 1, | ||
769 | All = AvatarTerse | PrimitiveTerse | PrimitiveFull, | ||
770 | } | ||
771 | |||
747 | public interface IClientAPI | 772 | public interface IClientAPI |
748 | { | 773 | { |
749 | Vector3 StartPos { get; set; } | 774 | Vector3 StartPos { get; set; } |
@@ -1118,6 +1143,8 @@ namespace OpenSim.Framework | |||
1118 | 1143 | ||
1119 | void SendPrimTerseUpdate(SendPrimitiveTerseData data); | 1144 | void SendPrimTerseUpdate(SendPrimitiveTerseData data); |
1120 | 1145 | ||
1146 | void ReprioritizeUpdates(StateUpdateTypes type, UpdatePriorityHandler handler); | ||
1147 | |||
1121 | void SendInventoryFolderDetails(UUID ownerID, UUID folderID, List<InventoryItemBase> items, | 1148 | void SendInventoryFolderDetails(UUID ownerID, UUID folderID, List<InventoryItemBase> items, |
1122 | List<InventoryFolderBase> folders, bool fetchFolders, | 1149 | List<InventoryFolderBase> folders, bool fetchFolders, |
1123 | bool fetchItems); | 1150 | bool fetchItems); |