diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Framework/IClientAPI.cs | 21 | ||||
-rw-r--r-- | OpenSim/Framework/ISceneEntity.cs | 1 |
2 files changed, 10 insertions, 12 deletions
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs index 00681cf..f51bf71 100644 --- a/OpenSim/Framework/IClientAPI.cs +++ b/OpenSim/Framework/IClientAPI.cs | |||
@@ -458,8 +458,6 @@ namespace OpenSim.Framework | |||
458 | public delegate void PlacesQuery(UUID QueryID, UUID TransactionID, string QueryText, uint QueryFlags, byte Category, string SimName, IClientAPI client); | 458 | public delegate void PlacesQuery(UUID QueryID, UUID TransactionID, string QueryText, uint QueryFlags, byte Category, string SimName, IClientAPI client); |
459 | 459 | ||
460 | public delegate void AgentFOV(IClientAPI client, float verticalAngle); | 460 | public delegate void AgentFOV(IClientAPI client, float verticalAngle); |
461 | |||
462 | public delegate double UpdatePriorityHandler(UpdatePriorityData data); | ||
463 | 461 | ||
464 | public delegate void MuteListEntryUpdate(IClientAPI client, UUID MuteID, string Name, int Flags,UUID AgentID); | 462 | public delegate void MuteListEntryUpdate(IClientAPI client, UUID MuteID, string Name, int Flags,UUID AgentID); |
465 | 463 | ||
@@ -571,17 +569,16 @@ namespace OpenSim.Framework | |||
571 | public float dwell; | 569 | public float dwell; |
572 | } | 570 | } |
573 | 571 | ||
574 | public struct UpdatePriorityData { | 572 | public class EntityUpdate |
575 | private double m_priority; | 573 | { |
576 | private uint m_localID; | 574 | public ISceneEntity Entity; |
575 | public PrimUpdateFlags Flags; | ||
577 | 576 | ||
578 | public UpdatePriorityData(double priority, uint localID) { | 577 | public EntityUpdate(ISceneEntity entity, PrimUpdateFlags flags) |
579 | this.m_priority = priority; | 578 | { |
580 | this.m_localID = localID; | 579 | Entity = entity; |
580 | Flags = flags; | ||
581 | } | 581 | } |
582 | |||
583 | public double priority { get { return this.m_priority; } } | ||
584 | public uint localID { get { return this.m_localID; } } | ||
585 | } | 582 | } |
586 | 583 | ||
587 | /// <summary> | 584 | /// <summary> |
@@ -1024,7 +1021,7 @@ namespace OpenSim.Framework | |||
1024 | 1021 | ||
1025 | void SendAvatarDataImmediate(ISceneEntity avatar); | 1022 | void SendAvatarDataImmediate(ISceneEntity avatar); |
1026 | void SendPrimUpdate(ISceneEntity entity, PrimUpdateFlags updateFlags); | 1023 | void SendPrimUpdate(ISceneEntity entity, PrimUpdateFlags updateFlags); |
1027 | void ReprioritizeUpdates(UpdatePriorityHandler handler); | 1024 | void ReprioritizeUpdates(); |
1028 | void FlushPrimUpdates(); | 1025 | void FlushPrimUpdates(); |
1029 | 1026 | ||
1030 | void SendInventoryFolderDetails(UUID ownerID, UUID folderID, List<InventoryItemBase> items, | 1027 | void SendInventoryFolderDetails(UUID ownerID, UUID folderID, List<InventoryItemBase> items, |
diff --git a/OpenSim/Framework/ISceneEntity.cs b/OpenSim/Framework/ISceneEntity.cs index fa3c514..5ac364f 100644 --- a/OpenSim/Framework/ISceneEntity.cs +++ b/OpenSim/Framework/ISceneEntity.cs | |||
@@ -33,5 +33,6 @@ namespace OpenSim.Framework | |||
33 | { | 33 | { |
34 | UUID UUID { get; } | 34 | UUID UUID { get; } |
35 | uint LocalId { get; } | 35 | uint LocalId { get; } |
36 | Vector3 AbsolutePosition { get; } | ||
36 | } | 37 | } |
37 | } | 38 | } |