From 64784bc0cf194a3fae0168dd5f2d6fadc8a9235d Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Tue, 15 Nov 2011 17:30:58 +0000
Subject: remove SceneCommunicationService.OnAvatarCrossingIntoRegion.  This
 stuff is not being used any more - it's now IEntityTransferModule and
 SimulationService instead

---
 OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs   | 1 -
 OpenSim/Region/Framework/Scenes/Scene.cs                     | 2 --
 OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs | 5 -----
 OpenSim/Region/Framework/Scenes/ScenePresence.cs             | 9 ++++++---
 4 files changed, 6 insertions(+), 11 deletions(-)

(limited to 'OpenSim')

diff --git a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
index 5721f33..21640cf 100644
--- a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
@@ -262,7 +262,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
             CacheFriends(client);
         }
 
-
         /// <summary>
         /// Cache the friends list or increment the refcount for the existing friends list.
         /// </summary>
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index ce5b493..781f922 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -3200,7 +3200,6 @@ namespace OpenSim.Region.Framework.Scenes
         /// </summary>
         public void RegisterCommsEvents()
         {
-            m_sceneGridService.OnAvatarCrossingIntoRegion += AgentCrossing;
             m_sceneGridService.OnCloseAgentConnection += IncomingCloseAgent;
             //m_eventManager.OnRegionUp += OtherRegionUp;
             //m_sceneGridService.OnChildAgentUpdate += IncomingChildAgentDataUpdate;
@@ -3218,7 +3217,6 @@ namespace OpenSim.Region.Framework.Scenes
             //m_sceneGridService.OnRemoveKnownRegionFromAvatar -= HandleRemoveKnownRegionsFromAvatar;
             //m_sceneGridService.OnChildAgentUpdate -= IncomingChildAgentDataUpdate;
             //m_eventManager.OnRegionUp -= OtherRegionUp;
-            m_sceneGridService.OnAvatarCrossingIntoRegion -= AgentCrossing;
             m_sceneGridService.OnCloseAgentConnection -= IncomingCloseAgent;
             m_sceneGridService.OnGetLandData -= GetLandData;
 
diff --git a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
index eccce89..ff45b1f 100644
--- a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
@@ -61,11 +61,6 @@ namespace OpenSim.Region.Framework.Scenes
         protected List<UUID> m_agentsInTransit;
 
         /// <summary>
-        /// An agent is crossing into this region
-        /// </summary>
-        public event AgentCrossing OnAvatarCrossingIntoRegion;
-
-        /// <summary>
         /// A user will arrive shortly, set up appropriate credentials so it can connect
         /// </summary>
 //        public event ExpectUserDelegate OnExpectUser;
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 098437a..189394e 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -859,9 +859,12 @@ namespace OpenSim.Region.Framework.Scenes
         #region Status Methods
 
         /// <summary>
-        /// This turns a child agent, into a root agent
-        /// This is called when an agent teleports into a region, or if an
-        /// agent crosses into this region from a neighbor over the border
+        /// Turns a child agent into a root agent.
+        /// </summary>
+        /// Child agents are logged into neighbouring sims largely to observe changes.  Root agents exist when the
+        /// avatar is actual in the sim.  They can perform all actions.
+        /// This change is made whenever an avatar enters a region, whether by crossing over from a neighbouring sim,
+        /// teleporting in or on initial login.
         /// </summary>
         public void MakeRootAgent(Vector3 pos, bool isFlying)
         {
-- 
cgit v1.1