Thank you very much KMeisthax for DataSnapshot 1.1

to enhance search capability on OpenSim sims using
external search engines such as Metaversink.com and
others.

1 files changed, 100 insertions, 34 deletions

diff --git a/OpenSim/Region/DataSnapshot/ObjectSnapshot.cs b/OpenSim/Region/DataSnapshot/ObjectSnapshot.cs
index 3270c3a..af73ba0 100644
--- a/OpenSim/Region/DataSnapshot/ObjectSnapshot.cs
+++ b/OpenSim/Region/DataSnapshot/ObjectSnapshot.cs
@@ -25,24 +25,63 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+using System;
+using System.Collections.Generic;
 using System.Reflection;
 using System.Xml;
 using log4net;
 using OpenSim.Region.DataSnapshot.Interfaces;
 using OpenSim.Region.Environment.Scenes;
+using OpenSim.Framework;
+using libsecondlife;
 
-namespace OpenSim.Region.DataSnapshot
+namespace OpenSim.Region.DataSnapshot.Providers
 {
     public class ObjectSnapshot : IDataSnapshotProvider
     {
         private Scene m_scene = null;
         private DataSnapshotManager m_parent = null;
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        private bool m_stale = true;
 
         public void Initialize(Scene scene, DataSnapshotManager parent)
         {
             m_scene = scene;
             m_parent = parent;
+
+            //To check for staleness, we must catch all incoming client packets.
+            m_scene.EventManager.OnNewClient += OnNewClient;
+            m_scene.EventManager.OnParcelPrimCountAdd += delegate(SceneObjectGroup obj) { this.Stale = true; };
+        }
+
+        public void OnNewClient(IClientAPI client)
+        {
+            //Detect object data changes by hooking into the IClientAPI.
+            //Very dirty, and breaks whenever someone changes the client API.
+
+            client.OnAddPrim += delegate (LLUUID ownerID, LLVector3 RayEnd, LLQuaternion rot,
+                PrimitiveBaseShape shape, byte bypassRaycast, LLVector3 RayStart, LLUUID RayTargetID,
+                byte RayEndIsIntersection) { this.Stale = true; };
+            client.OnLinkObjects += delegate (IClientAPI remoteClient, uint parent, List<uint> children)
+                { this.Stale = true; };
+            client.OnDelinkObjects += delegate(List<uint> primIds) { this.Stale = true; };
+            client.OnGrabUpdate += delegate(LLUUID objectID, LLVector3 offset, LLVector3 grapPos,
+                IClientAPI remoteClient) { this.Stale = true; };
+            client.OnObjectAttach += delegate(IClientAPI remoteClient, uint objectLocalID, uint AttachmentPt,
+                LLQuaternion rot) { this.Stale = true; };
+            client.OnObjectDuplicate += delegate(uint localID, LLVector3 offset, uint dupeFlags, LLUUID AgentID,
+                LLUUID GroupID) { this.Stale = true; };
+            client.OnObjectDuplicateOnRay += delegate(uint localID, uint dupeFlags, LLUUID AgentID, LLUUID GroupID,
+                LLUUID RayTargetObj, LLVector3 RayEnd, LLVector3 RayStart, bool BypassRaycast,
+                bool RayEndIsIntersection, bool CopyCenters, bool CopyRotates) { this.Stale = true; };
+            client.OnObjectIncludeInSearch += delegate(IClientAPI remoteClient, bool IncludeInSearch, uint localID)
+                { this.Stale = true; };
+            client.OnObjectPermissions += delegate(IClientAPI controller, LLUUID agentID, LLUUID sessionID,
+                byte field, uint localId, uint mask, byte set) { this.Stale = true; };
+            client.OnRezObject += delegate(IClientAPI remoteClient, LLUUID itemID, LLVector3 RayEnd,
+                LLVector3 RayStart, LLUUID RayTargetID, byte BypassRayCast, bool RayEndIsIntersection, 
+                uint EveryoneMask, uint GroupMask, uint NextOwnerMask, uint ItemFlags, bool RezSelected,
+                bool RemoveItem, LLUUID fromTaskID) { this.Stale = true; };
         }
 
         public Scene GetParentScene
@@ -52,56 +91,83 @@ namespace OpenSim.Region.DataSnapshot
 
         public XmlNode RequestSnapshotData(XmlDocument nodeFactory)
         {
+            m_log.Debug("[DATASNAPSHOT]: Generating object data for scene " + m_scene.RegionInfo.RegionName);
+
             XmlNode parent = nodeFactory.CreateNode(XmlNodeType.Element, "objectdata", "");
             XmlNode node;
-#if LIBSL_IS_FIXED
+
             foreach (EntityBase entity in m_scene.Entities.Values)
             {
                 // only objects, not avatars
-                if (entity is SceneObjectGroup)
+                if (entity is SceneObjectGroup) 
                 {
                     SceneObjectGroup obj = (SceneObjectGroup)entity;
 
-                    XmlNode xmlobject = nodeFactory.CreateNode(XmlNodeType.Element, "object", "");
+                    m_log.Debug("[DATASNAPSHOT]: Found object " + obj.Name + " in scene");
 
-                    node = nodeFactory.CreateNode(XmlNodeType.Element, "uuid", "");
-                    node.InnerText = obj.UUID.ToString();
-                    xmlobject.AppendChild(node);
+                    if ((obj.RootPart.Flags & LLObject.ObjectFlags.JointWheel) == LLObject.ObjectFlags.JointWheel) {
+                        XmlNode xmlobject = nodeFactory.CreateNode(XmlNodeType.Element, "object", "");
 
-                    SceneObjectPart m_rootPart = null;
-                    try
-                    {
-                        Type sog = typeof(SceneObjectGroup);
-                        FieldInfo rootField = sog.GetField("m_rootPart", BindingFlags.NonPublic | BindingFlags.Instance);
-                        if (rootField != null)
-                        {
-                            m_rootPart = (SceneObjectPart)rootField.GetValue(obj);
-                        }
-                    }
-                    catch (Exception e)
-                    {
-                        Console.WriteLine("[DATASNAPSHOT] couldn't access field reflectively\n" + e.ToString());
-                    }
-                    if (m_rootPart != null)
-                    {
-                        node = nodeFactory.CreateNode(XmlNodeType.Element, "title", "");
-                        node.InnerText = m_rootPart.Name;
+                        node = nodeFactory.CreateNode(XmlNodeType.Element, "uuid", "");
+                        node.InnerText = obj.UUID.ToString();
                         xmlobject.AppendChild(node);
 
-                        node = nodeFactory.CreateNode(XmlNodeType.Element, "description", "");
-                        node.InnerText = m_rootPart.Description;
-                        xmlobject.AppendChild(node);
+                        SceneObjectPart m_rootPart = null;
+                        try
+                        {
+                            Type sog = typeof(SceneObjectGroup);
+                            FieldInfo rootField = sog.GetField("m_rootPart", BindingFlags.NonPublic | BindingFlags.Instance);
+                            if (rootField != null)
+                            {
+                                m_rootPart = (SceneObjectPart)rootField.GetValue(obj);
+                            }
+                        }
+                        catch (Exception e)
+                        {
+                            Console.WriteLine("[DATASNAPSHOT] couldn't access field reflectively\n" + e.ToString());
+                        }
+                        if (m_rootPart != null)
+                        {
+                            node = nodeFactory.CreateNode(XmlNodeType.Element, "title", "");
+                            node.InnerText = m_rootPart.Name;
+                            xmlobject.AppendChild(node);
 
-                        node = nodeFactory.CreateNode(XmlNodeType.Element, "flags", "");
-                        node.InnerText = String.Format("{0:x}", m_rootPart.ObjectFlags);
-                        xmlobject.AppendChild(node);
+                            node = nodeFactory.CreateNode(XmlNodeType.Element, "description", "");
+                            node.InnerText = m_rootPart.Description;
+                            xmlobject.AppendChild(node);
+                            
+                            node = nodeFactory.CreateNode(XmlNodeType.Element, "flags", "");
+                            node.InnerText = String.Format("{0:x}", m_rootPart.ObjectFlags);
+                            xmlobject.AppendChild(node);
+                        }
+                        parent.AppendChild(xmlobject);
                     }
-                    parent.AppendChild(xmlobject);
                 }
             }
-#endif
+            this.Stale = false;
             return parent;
+        }
 
+        public String Name
+        {
+            get { return "ObjectSnapshot"; }
         }
+
+        public bool Stale
+        {
+            get
+            {
+                return m_stale;
+            }
+            set
+            {
+                m_stale = value;
+
+                if (m_stale)
+                    OnStale(this);
+            }
+        }
+
+        public event ProviderStale OnStale;
     }
-}
+}
\ No newline at end of file