OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

remove SceneCommunicationService.OnAvatarCrossingIntoRegion. This stuff is not being used any more - it's now IEntityTransferModule and SimulationService instead

iar_mods
Justin Clark-Casey (justincc) 2011-11-15 17:30:58 +00:00
parent 430821d837
commit 64784bc0cf
4 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
View File

@ -262,7 +262,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
CacheFriends(client); CacheFriends(client);
} }
/// <summary> /// <summary>
/// Cache the friends list or increment the refcount for the existing friends list. /// Cache the friends list or increment the refcount for the existing friends list.
/// </summary> /// </summary>

2
OpenSim/Region/Framework/Scenes/Scene.cs
View File

@ -3200,7 +3200,6 @@ namespace OpenSim.Region.Framework.Scenes
/// </summary> /// </summary>
public void RegisterCommsEvents() public void RegisterCommsEvents()
{ {
m_sceneGridService.OnAvatarCrossingIntoRegion += AgentCrossing;
m_sceneGridService.OnCloseAgentConnection += IncomingCloseAgent; m_sceneGridService.OnCloseAgentConnection += IncomingCloseAgent;
//m_eventManager.OnRegionUp += OtherRegionUp; //m_eventManager.OnRegionUp += OtherRegionUp;
//m_sceneGridService.OnChildAgentUpdate += IncomingChildAgentDataUpdate; //m_sceneGridService.OnChildAgentUpdate += IncomingChildAgentDataUpdate;
@ -3218,7 +3217,6 @@ namespace OpenSim.Region.Framework.Scenes
//m_sceneGridService.OnRemoveKnownRegionFromAvatar -= HandleRemoveKnownRegionsFromAvatar; //m_sceneGridService.OnRemoveKnownRegionFromAvatar -= HandleRemoveKnownRegionsFromAvatar;
//m_sceneGridService.OnChildAgentUpdate -= IncomingChildAgentDataUpdate; //m_sceneGridService.OnChildAgentUpdate -= IncomingChildAgentDataUpdate;
//m_eventManager.OnRegionUp -= OtherRegionUp; //m_eventManager.OnRegionUp -= OtherRegionUp;
m_sceneGridService.OnAvatarCrossingIntoRegion -= AgentCrossing;
m_sceneGridService.OnCloseAgentConnection -= IncomingCloseAgent; m_sceneGridService.OnCloseAgentConnection -= IncomingCloseAgent;
m_sceneGridService.OnGetLandData -= GetLandData; m_sceneGridService.OnGetLandData -= GetLandData;

5
OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
View File

@ -60,11 +60,6 @@ namespace OpenSim.Region.Framework.Scenes
protected List<UUID> m_agentsInTransit; protected List<UUID> m_agentsInTransit;
/// <summary>
/// An agent is crossing into this region
/// </summary>
public event AgentCrossing OnAvatarCrossingIntoRegion;
/// <summary> /// <summary>
/// A user will arrive shortly, set up appropriate credentials so it can connect /// A user will arrive shortly, set up appropriate credentials so it can connect
/// </summary> /// </summary>

9
OpenSim/Region/Framework/Scenes/ScenePresence.cs
View File

@ -859,9 +859,12 @@ namespace OpenSim.Region.Framework.Scenes
#region Status Methods #region Status Methods
/// <summary> /// <summary>
/// This turns a child agent, into a root agent /// Turns a child agent into a root agent.
/// This is called when an agent teleports into a region, or if an /// </summary>
/// agent crosses into this region from a neighbor over the border /// 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> /// </summary>
public void MakeRootAgent(Vector3 pos, bool isFlying) public void MakeRootAgent(Vector3 pos, bool isFlying)
{ {