From 80ba3de90240d190bad1bd15ff89dfdb390c5e24 Mon Sep 17 00:00:00 2001
From: Mic Bowman
Date: Tue, 12 Apr 2011 15:40:57 -0700
Subject: 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.

---
 OpenSim/Framework/IClientAPI.cs | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'OpenSim/Framework')

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
         public ISceneEntity Entity;
         public uint Flags;
 
+        public virtual void Update(IEntityUpdate update)
+        {
+            this.Flags |= update.Flags;
+        }
+
         public IEntityUpdate(ISceneEntity entity, uint flags)
         {
             Entity = entity;
-- 
cgit v1.1