aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authorJohn Hurliman2010-05-21 13:55:36 -0700
committerJohn Hurliman2010-05-21 13:55:36 -0700
commit93ef65c69055157e0b7d51e544abe5a1035f40f0 (patch)
tree0afcfd50591e34f0a5d7efa474f300cf09083f69 /OpenSim/Framework
parentminor: remove LongRunning test designator from TestAddSceneObject() since it ... (diff)
downloadopensim-SC_OLD-93ef65c69055157e0b7d51e544abe5a1035f40f0.zip
opensim-SC_OLD-93ef65c69055157e0b7d51e544abe5a1035f40f0.tar.gz
opensim-SC_OLD-93ef65c69055157e0b7d51e544abe5a1035f40f0.tar.bz2
opensim-SC_OLD-93ef65c69055157e0b7d51e544abe5a1035f40f0.tar.xz
* Moving all of the prioritization/reprioritization code into a new file Prioritizer.cs
* Simplified the interest management code to make it easier to add new policies. Prioritization and reprioritization share code paths now * Improved the distance and front back policies to always give your avatar the highest priority
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/IClientAPI.cs21
-rw-r--r--OpenSim/Framework/ISceneEntity.cs1
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}