aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authorMic Bowman2011-04-12 15:40:57 -0700
committerMic Bowman2011-04-13 15:37:25 -0700
commitb33aac737a3e7ae28216cb98de99d9c6eba1d563 (patch)
tree9a755778c7ebad6167179847b23623b023bf340d /OpenSim/Framework
parentfixed a couple bugs with the property queues (diff)
downloadopensim-SC_OLD-b33aac737a3e7ae28216cb98de99d9c6eba1d563.zip
opensim-SC_OLD-b33aac737a3e7ae28216cb98de99d9c6eba1d563.tar.gz
opensim-SC_OLD-b33aac737a3e7ae28216cb98de99d9c6eba1d563.tar.bz2
opensim-SC_OLD-b33aac737a3e7ae28216cb98de99d9c6eba1d563.tar.xz
Fixed the update of items in the priority queue to enable both
types of property updates to be specified. Not sure if one form of property update should supercede another. But for now the old OpenSim behavior is preserved by sending both.
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/IClientAPI.cs5
1 files changed, 5 insertions, 0 deletions
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs
index c56a756..f573c32 100644
--- a/OpenSim/Framework/IClientAPI.cs
+++ b/OpenSim/Framework/IClientAPI.cs
@@ -575,6 +575,11 @@ namespace OpenSim.Framework
575 public ISceneEntity Entity; 575 public ISceneEntity Entity;
576 public uint Flags; 576 public uint Flags;
577 577
578 public virtual void Update(IEntityUpdate update)
579 {
580 this.Flags |= update.Flags;
581 }
582
578 public IEntityUpdate(ISceneEntity entity, uint flags) 583 public IEntityUpdate(ISceneEntity entity, uint flags)
579 { 584 {
580 Entity = entity; 585 Entity = entity;