3 files changed, 6 insertions, 333 deletions

diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 28720ad..93f684c 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -2785,17 +2785,11 @@ namespace OpenSim.Region.Framework.Scenes
             SubscribeToClientPrimEvents(client);
             SubscribeToClientPrimRezEvents(client);
             SubscribeToClientInventoryEvents(client);
-            SubscribeToClientAttachmentEvents(client);
             SubscribeToClientTeleportEvents(client);
             SubscribeToClientScriptEvents(client);
             SubscribeToClientParcelEvents(client);
             SubscribeToClientGridEvents(client);
-            SubscribeToClientGodEvents(client);
-
             SubscribeToClientNetworkEvents(client);
-            
-
-            // EventManager.TriggerOnNewClient(client);
         }
 
         public virtual void SubscribeToClientTerrainEvents(IClientAPI client)
@@ -2805,8 +2799,7 @@ namespace OpenSim.Region.Framework.Scenes
         }
         
         public virtual void SubscribeToClientPrimEvents(IClientAPI client)
-        {
-            
+        {            
             client.OnUpdatePrimGroupPosition += m_sceneGraph.UpdatePrimPosition;
             client.OnUpdatePrimSinglePosition += m_sceneGraph.UpdatePrimSinglePosition;
             client.OnUpdatePrimGroupRotation += m_sceneGraph.UpdatePrimRotation;
@@ -2876,18 +2869,6 @@ namespace OpenSim.Region.Framework.Scenes
             client.OnMoveTaskItem += ClientMoveTaskInventoryItem;
         }
 
-        public virtual void SubscribeToClientAttachmentEvents(IClientAPI client)
-        {                                    
-            if (AttachmentsModule != null)
-            {
-                client.OnRezSingleAttachmentFromInv += AttachmentsModule.RezSingleAttachmentFromInventory;
-                client.OnRezMultipleAttachmentsFromInv += AttachmentsModule.RezMultipleAttachmentsFromInventory;
-                client.OnObjectAttach += AttachmentsModule.AttachObject;
-                client.OnObjectDetach += AttachmentsModule.DetachObject;
-                client.OnDetachAttachmentIntoInv += AttachmentsModule.ShowDetachInUserInventory;
-            }
-        }
-
         public virtual void SubscribeToClientTeleportEvents(IClientAPI client)
         {
             client.OnTeleportLocationRequest += RequestTeleportLocation;
@@ -2917,44 +2898,29 @@ namespace OpenSim.Region.Framework.Scenes
             client.OnSetStartLocationRequest += SetHomeRezPoint;
             client.OnRegionHandleRequest += RegionHandleRequest;
         }
-
-        public virtual void SubscribeToClientGodEvents(IClientAPI client)
-        {
-            IGodsModule godsModule = RequestModuleInterface<IGodsModule>();
-            client.OnGodKickUser += godsModule.KickUser;
-            client.OnRequestGodlikePowers += godsModule.RequestGodlikePowers;
-        }
-
+        
         public virtual void SubscribeToClientNetworkEvents(IClientAPI client)
         {
             client.OnNetworkStatsUpdate += StatsReporter.AddPacketsStats;
             client.OnViewerEffect += ProcessViewerEffect;
         }
 
-        protected virtual void UnsubscribeToClientEvents(IClientAPI client)
-        {
-        }
-
         /// <summary>
-        /// Register for events from the client
+        /// Unsubscribe the client from events.
         /// </summary>
-        /// <param name="client">The IClientAPI of the connected client</param>
+        /// FIXME: Not called anywhere!
+        /// <param name="client">The IClientAPI of the client</param>
         public virtual void UnSubscribeToClientEvents(IClientAPI client)
         {
             UnSubscribeToClientTerrainEvents(client);
             UnSubscribeToClientPrimEvents(client);
             UnSubscribeToClientPrimRezEvents(client);
             UnSubscribeToClientInventoryEvents(client);
-            UnSubscribeToClientAttachmentEvents(client);
             UnSubscribeToClientTeleportEvents(client);
             UnSubscribeToClientScriptEvents(client);
             UnSubscribeToClientParcelEvents(client);
             UnSubscribeToClientGridEvents(client);
-            UnSubscribeToClientGodEvents(client);
-
             UnSubscribeToClientNetworkEvents(client);
-
-            // EventManager.TriggerOnNewClient(client);
         }
 
         public virtual void UnSubscribeToClientTerrainEvents(IClientAPI client)
@@ -3031,18 +2997,6 @@ namespace OpenSim.Region.Framework.Scenes
             client.OnMoveTaskItem -= ClientMoveTaskInventoryItem;
         }
 
-        public virtual void UnSubscribeToClientAttachmentEvents(IClientAPI client)
-        {            
-            if (AttachmentsModule != null)
-            {
-                client.OnRezSingleAttachmentFromInv -= AttachmentsModule.RezSingleAttachmentFromInventory;
-                client.OnRezMultipleAttachmentsFromInv -= AttachmentsModule.RezMultipleAttachmentsFromInventory;
-                client.OnObjectAttach -= AttachmentsModule.AttachObject;
-                client.OnObjectDetach -= AttachmentsModule.DetachObject;
-                client.OnDetachAttachmentIntoInv -= AttachmentsModule.ShowDetachInUserInventory;
-            }
-        }
-
         public virtual void UnSubscribeToClientTeleportEvents(IClientAPI client)
         {
             client.OnTeleportLocationRequest -= RequestTeleportLocation;
@@ -3074,13 +3028,6 @@ namespace OpenSim.Region.Framework.Scenes
             client.OnRegionHandleRequest -= RegionHandleRequest;
         }
 
-        public virtual void UnSubscribeToClientGodEvents(IClientAPI client)
-        {
-            IGodsModule godsModule = RequestModuleInterface<IGodsModule>();
-            client.OnGodKickUser -= godsModule.KickUser;
-            client.OnRequestGodlikePowers -= godsModule.RequestGodlikePowers;
-        }
-
         public virtual void UnSubscribeToClientNetworkEvents(IClientAPI client)
         {
             client.OnNetworkStatsUpdate -= StatsReporter.AddPacketsStats;
@@ -5294,4 +5241,4 @@ namespace OpenSim.Region.Framework.Scenes
             return offsets.ToArray();
         }
     }
-}
+}
\ No newline at end of file
diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
index 40332a6..f47450f 100644
--- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
@@ -78,8 +78,6 @@ namespace OpenSim.Region.Framework.Scenes
 //        protected internal Dictionary<UUID, EntityBase> Entities = new Dictionary<UUID, EntityBase>();
         protected internal Dictionary<UUID, ScenePresence> RestorePresences = new Dictionary<UUID, ScenePresence>();
 
-        protected internal BasicQuadTreeNode QuadTree;
-
         protected RegionInfo m_regInfo;
         protected Scene m_parentScene;
         protected Dictionary<UUID, SceneObjectGroup> m_updateList = new Dictionary<UUID, SceneObjectGroup>();
@@ -107,9 +105,6 @@ namespace OpenSim.Region.Framework.Scenes
         {
             m_parentScene = parent;
             m_regInfo = regInfo;
-            QuadTree = new BasicQuadTreeNode(null, "/0/", 0, 0, (short)Constants.RegionSize, (short)Constants.RegionSize);
-            QuadTree.Subdivide();
-            QuadTree.Subdivide();
         }
 
         public PhysicsScene PhysicsScene
diff --git a/OpenSim/Region/Framework/Scenes/Types/BasicQuadTreeNode.cs b/OpenSim/Region/Framework/Scenes/Types/BasicQuadTreeNode.cs
deleted file mode 100644
index 38a9203..0000000
--- a/OpenSim/Region/Framework/Scenes/Types/BasicQuadTreeNode.cs
+++ /dev/null
@@ -1,269 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSimulator Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-using System;
-using System.Collections.Generic;
-using OpenSim.Region.Framework.Scenes;
-
-namespace OpenSim.Region.Framework.Scenes.Types
-{
-    public class BasicQuadTreeNode
-    {
-        private List<SceneObjectGroup> m_objects = new List<SceneObjectGroup>();
-        private BasicQuadTreeNode[] m_childNodes = null;
-        private BasicQuadTreeNode m_parent = null;
-
-        private short m_leftX;
-        private short m_leftY;
-        private short m_width;
-        private short m_height;
-        //private int m_quadNumber;
-        private string m_quadID;
-
-        public BasicQuadTreeNode(BasicQuadTreeNode parent, string quadID, short leftX, short leftY, short width,
-                                 short height)
-        {
-            m_parent = parent;
-            m_quadID = quadID;
-            m_leftX = leftX;
-            m_leftY = leftY;
-            m_width = width;
-            m_height = height;
-            // m_log.Debug("creating quadtree node " + m_quadID);
-        }
-
-        public void AddObject(SceneObjectGroup obj)
-        {
-            if (m_childNodes == null)
-            {
-                if (!m_objects.Contains(obj))
-                {
-                    m_objects.Add(obj);
-                }
-            }
-            else
-            {
-                if (obj.AbsolutePosition.X < (m_leftX + (m_width/2)))
-                {
-                    if (obj.AbsolutePosition.Y < (m_leftY + (m_height/2)))
-                    {
-                        m_childNodes[0].AddObject(obj);
-                    }
-                    else
-                    {
-                        m_childNodes[2].AddObject(obj);
-                    }
-                }
-                else
-                {
-                    if (obj.AbsolutePosition.Y < (m_leftY + (m_height/2)))
-                    {
-                        m_childNodes[1].AddObject(obj);
-                    }
-                    else
-                    {
-                        m_childNodes[3].AddObject(obj);
-                    }
-                }
-            }
-        }
-
-        public void Subdivide()
-        {
-            if (m_childNodes == null)
-            {
-                m_childNodes = new BasicQuadTreeNode[4];
-                m_childNodes[0] =
-                    new BasicQuadTreeNode(this, m_quadID + "1/", m_leftX, m_leftY, (short) (m_width/2),
-                                          (short) (m_height/2));
-                m_childNodes[1] =
-                    new BasicQuadTreeNode(this, m_quadID + "2/", (short) (m_leftX + (m_width/2)), m_leftY,
-                                          (short) (m_width/2), (short) (m_height/2));
-                m_childNodes[2] =
-                    new BasicQuadTreeNode(this, m_quadID + "3/", m_leftX, (short) (m_leftY + (m_height/2)),
-                                          (short) (m_width/2), (short) (m_height/2));
-                m_childNodes[3] =
-                    new BasicQuadTreeNode(this, m_quadID + "4/", (short) (m_leftX + (m_width/2)),
-                                          (short) (m_height + (m_height/2)), (short) (m_width/2), (short) (m_height/2));
-            }
-            else
-            {
-                for (int i = 0; i < m_childNodes.Length; i++)
-                {
-                    m_childNodes[i].Subdivide();
-                }
-            }
-        }
-
-        public List<SceneObjectGroup> GetObjectsFrom(float x, float y)
-        {
-            if (m_childNodes == null)
-            {
-                return new List<SceneObjectGroup>(m_objects);
-            }
-            else
-            {
-                if (x < m_leftX + (m_width/2))
-                {
-                    if (y < m_leftY + (m_height/2))
-                    {
-                        return m_childNodes[0].GetObjectsFrom(x, y);
-                    }
-                    else
-                    {
-                        return m_childNodes[2].GetObjectsFrom(x, y);
-                    }
-                }
-                else
-                {
-                    if (y < m_leftY + (m_height/2))
-                    {
-                        return m_childNodes[1].GetObjectsFrom(x, y);
-                    }
-                    else
-                    {
-                        return m_childNodes[3].GetObjectsFrom(x, y);
-                    }
-                }
-            }
-        }
-
-        public List<SceneObjectGroup> GetObjectsFrom(string nodeName)
-        {
-            if (nodeName == m_quadID)
-            {
-                return new List<SceneObjectGroup>(m_objects);
-            }
-            else if (m_childNodes != null)
-            {
-                for (int i = 0; i < 4; i++)
-                {
-                    List<SceneObjectGroup> retVal;
-                    retVal = m_childNodes[i].GetObjectsFrom(nodeName);
-                    if (retVal != null)
-                    {
-                        return retVal;
-                    }
-                }
-            }
-            return null;
-        }
-
-        public string GetNodeID(float x, float y)
-        {
-            if (m_childNodes == null)
-            {
-                return m_quadID;
-            }
-            else
-            {
-                if (x < m_leftX + (m_width/2))
-                {
-                    if (y < m_leftY + (m_height/2))
-                    {
-                        return m_childNodes[0].GetNodeID(x, y);
-                    }
-                    else
-                    {
-                        return m_childNodes[2].GetNodeID(x, y);
-                    }
-                }
-                else
-                {
-                    if (y < m_leftY + (m_height/2))
-                    {
-                        return m_childNodes[1].GetNodeID(x, y);
-                    }
-                    else
-                    {
-                        return m_childNodes[3].GetNodeID(x, y);
-                    }
-                }
-            }
-        }
-
-        public void Update()
-        {
-            if (m_childNodes != null)
-            {
-                for (int i = 0; i < 4; i++)
-                {
-                    m_childNodes[i].Update();
-                }
-            }
-            else
-            {
-                List<SceneObjectGroup> outBounds = new List<SceneObjectGroup>();
-                foreach (SceneObjectGroup group in m_objects)
-                {
-                    if (((group.AbsolutePosition.X > m_leftX) && (group.AbsolutePosition.X < (m_leftX + m_width))) &&
-                        ((group.AbsolutePosition.Y > m_leftY) && (group.AbsolutePosition.Y < (m_leftY + m_height))))
-                    {
-                        //still in bounds
-                    }
-                    else
-                    {
-                        outBounds.Add(group);
-                    }
-                }
-
-                foreach (SceneObjectGroup removee in outBounds)
-                {
-                    m_objects.Remove(removee);
-                    if (m_parent != null)
-                    {
-                        m_parent.PassUp(removee);
-                    }
-                }
-                outBounds.Clear();
-            }
-        }
-
-        public void PassUp(SceneObjectGroup group)
-        {
-            if (((group.AbsolutePosition.X > m_leftX) && (group.AbsolutePosition.X < (m_leftX + m_width))) &&
-                ((group.AbsolutePosition.Y > m_leftY) && (group.AbsolutePosition.Y < (m_leftY + m_height))))
-            {
-                AddObject(group);
-            }
-            else
-            {
-                if (m_parent != null)
-                {
-                    m_parent.PassUp(group);
-                }
-            }
-        }
-
-        public string[] GetNeighbours(string nodeName)
-        {
-            string[] retVal = new string[1];
-            retVal[0] = String.Empty;
-            return retVal;
-        }
-    }
-}