diff options
author | Justin Clark-Casey (justincc) | 2011-11-15 18:16:43 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2011-11-15 18:16:43 +0000 |
commit | a3c5f76942270f17e359bfcf8f43c6db3d1f782d (patch) | |
tree | 65a49534eaa9a5f9aa83754b55d5f9532ee7dea9 /OpenSim/Region/Framework/Scenes/Scene.cs | |
parent | Remove prebuild reference to now gone PumaCode.SvnDotNet.dll (diff) | |
download | opensim-SC_OLD-a3c5f76942270f17e359bfcf8f43c6db3d1f782d.zip opensim-SC_OLD-a3c5f76942270f17e359bfcf8f43c6db3d1f782d.tar.gz opensim-SC_OLD-a3c5f76942270f17e359bfcf8f43c6db3d1f782d.tar.bz2 opensim-SC_OLD-a3c5f76942270f17e359bfcf8f43c6db3d1f782d.tar.xz |
Removed unused and mostly commented out SceneCommunicationService methods
As far as I can see, the SCS is only now used for informing neighbours of up/down status and possibly sending child agent updates and close requests
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 38 |
1 files changed, 2 insertions, 36 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 781f922..fb4b545 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -1121,8 +1121,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
1121 | 1121 | ||
1122 | m_sceneGraph.Close(); | 1122 | m_sceneGraph.Close(); |
1123 | 1123 | ||
1124 | // De-register with region communications (events cleanup) | 1124 | if (!GridService.DeregisterRegion(m_regInfo.RegionID)) |
1125 | UnRegisterRegionWithComms(); | 1125 | m_log.WarnFormat("[SCENE]: Deregister from grid failed for region {0}", m_regInfo.RegionName); |
1126 | 1126 | ||
1127 | // call the base class Close method. | 1127 | // call the base class Close method. |
1128 | base.Close(); | 1128 | base.Close(); |
@@ -1623,8 +1623,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
1623 | /// <exception cref="System.Exception">Thrown if registration of the region itself fails.</exception> | 1623 | /// <exception cref="System.Exception">Thrown if registration of the region itself fails.</exception> |
1624 | public void RegisterRegionWithGrid() | 1624 | public void RegisterRegionWithGrid() |
1625 | { | 1625 | { |
1626 | RegisterCommsEvents(); | ||
1627 | |||
1628 | m_sceneGridService.SetScene(this); | 1626 | m_sceneGridService.SetScene(this); |
1629 | 1627 | ||
1630 | GridRegion region = new GridRegion(RegionInfo); | 1628 | GridRegion region = new GridRegion(RegionInfo); |
@@ -3196,38 +3194,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
3196 | #region RegionComms | 3194 | #region RegionComms |
3197 | 3195 | ||
3198 | /// <summary> | 3196 | /// <summary> |
3199 | /// Register the methods that should be invoked when this scene receives various incoming events | ||
3200 | /// </summary> | ||
3201 | public void RegisterCommsEvents() | ||
3202 | { | ||
3203 | m_sceneGridService.OnCloseAgentConnection += IncomingCloseAgent; | ||
3204 | //m_eventManager.OnRegionUp += OtherRegionUp; | ||
3205 | //m_sceneGridService.OnChildAgentUpdate += IncomingChildAgentDataUpdate; | ||
3206 | //m_sceneGridService.OnRemoveKnownRegionFromAvatar += HandleRemoveKnownRegionsFromAvatar; | ||
3207 | m_sceneGridService.OnLogOffUser += HandleLogOffUserFromGrid; | ||
3208 | m_sceneGridService.OnGetLandData += GetLandData; | ||
3209 | } | ||
3210 | |||
3211 | /// <summary> | ||
3212 | /// Deregister this scene from receiving incoming region events | ||
3213 | /// </summary> | ||
3214 | public void UnRegisterRegionWithComms() | ||
3215 | { | ||
3216 | m_sceneGridService.OnLogOffUser -= HandleLogOffUserFromGrid; | ||
3217 | //m_sceneGridService.OnRemoveKnownRegionFromAvatar -= HandleRemoveKnownRegionsFromAvatar; | ||
3218 | //m_sceneGridService.OnChildAgentUpdate -= IncomingChildAgentDataUpdate; | ||
3219 | //m_eventManager.OnRegionUp -= OtherRegionUp; | ||
3220 | m_sceneGridService.OnCloseAgentConnection -= IncomingCloseAgent; | ||
3221 | m_sceneGridService.OnGetLandData -= GetLandData; | ||
3222 | |||
3223 | // this does nothing; should be removed | ||
3224 | m_sceneGridService.Close(); | ||
3225 | |||
3226 | if (!GridService.DeregisterRegion(m_regInfo.RegionID)) | ||
3227 | m_log.WarnFormat("[SCENE]: Deregister from grid failed for region {0}", m_regInfo.RegionName); | ||
3228 | } | ||
3229 | |||
3230 | /// <summary> | ||
3231 | /// Do the work necessary to initiate a new user connection for a particular scene. | 3197 | /// Do the work necessary to initiate a new user connection for a particular scene. |
3232 | /// At the moment, this consists of setting up the caps infrastructure | 3198 | /// At the moment, this consists of setting up the caps infrastructure |
3233 | /// The return bool should allow for connections to be refused, but as not all calling paths | 3199 | /// The return bool should allow for connections to be refused, but as not all calling paths |