aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs1
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs2
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs5
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs9
4 files changed, 6 insertions, 11 deletions
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
262 CacheFriends(client); 262 CacheFriends(client);
263 } 263 }
264 264
265
266 /// <summary> 265 /// <summary>
267 /// Cache the friends list or increment the refcount for the existing friends list. 266 /// Cache the friends list or increment the refcount for the existing friends list.
268 /// </summary> 267 /// </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
3200 /// </summary> 3200 /// </summary>
3201 public void RegisterCommsEvents() 3201 public void RegisterCommsEvents()
3202 { 3202 {
3203 m_sceneGridService.OnAvatarCrossingIntoRegion += AgentCrossing;
3204 m_sceneGridService.OnCloseAgentConnection += IncomingCloseAgent; 3203 m_sceneGridService.OnCloseAgentConnection += IncomingCloseAgent;
3205 //m_eventManager.OnRegionUp += OtherRegionUp; 3204 //m_eventManager.OnRegionUp += OtherRegionUp;
3206 //m_sceneGridService.OnChildAgentUpdate += IncomingChildAgentDataUpdate; 3205 //m_sceneGridService.OnChildAgentUpdate += IncomingChildAgentDataUpdate;
@@ -3218,7 +3217,6 @@ namespace OpenSim.Region.Framework.Scenes
3218 //m_sceneGridService.OnRemoveKnownRegionFromAvatar -= HandleRemoveKnownRegionsFromAvatar; 3217 //m_sceneGridService.OnRemoveKnownRegionFromAvatar -= HandleRemoveKnownRegionsFromAvatar;
3219 //m_sceneGridService.OnChildAgentUpdate -= IncomingChildAgentDataUpdate; 3218 //m_sceneGridService.OnChildAgentUpdate -= IncomingChildAgentDataUpdate;
3220 //m_eventManager.OnRegionUp -= OtherRegionUp; 3219 //m_eventManager.OnRegionUp -= OtherRegionUp;
3221 m_sceneGridService.OnAvatarCrossingIntoRegion -= AgentCrossing;
3222 m_sceneGridService.OnCloseAgentConnection -= IncomingCloseAgent; 3220 m_sceneGridService.OnCloseAgentConnection -= IncomingCloseAgent;
3223 m_sceneGridService.OnGetLandData -= GetLandData; 3221 m_sceneGridService.OnGetLandData -= GetLandData;
3224 3222
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
61 protected List<UUID> m_agentsInTransit; 61 protected List<UUID> m_agentsInTransit;
62 62
63 /// <summary> 63 /// <summary>
64 /// An agent is crossing into this region
65 /// </summary>
66 public event AgentCrossing OnAvatarCrossingIntoRegion;
67
68 /// <summary>
69 /// A user will arrive shortly, set up appropriate credentials so it can connect 64 /// A user will arrive shortly, set up appropriate credentials so it can connect
70 /// </summary> 65 /// </summary>
71// public event ExpectUserDelegate OnExpectUser; 66// 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
859 #region Status Methods 859 #region Status Methods
860 860
861 /// <summary> 861 /// <summary>
862 /// This turns a child agent, into a root agent 862 /// Turns a child agent into a root agent.
863 /// This is called when an agent teleports into a region, or if an 863 /// </summary>
864 /// agent crosses into this region from a neighbor over the border 864 /// Child agents are logged into neighbouring sims largely to observe changes. Root agents exist when the
865 /// avatar is actual in the sim. They can perform all actions.
866 /// This change is made whenever an avatar enters a region, whether by crossing over from a neighbouring sim,
867 /// teleporting in or on initial login.
865 /// </summary> 868 /// </summary>
866 public void MakeRootAgent(Vector3 pos, bool isFlying) 869 public void MakeRootAgent(Vector3 pos, bool isFlying)
867 { 870 {