aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
diff options
context:
space:
mode:
authordiva2009-02-20 03:39:50 +0000
committerdiva2009-02-20 03:39:50 +0000
commit33330297d603a66cc157baa21c81328edc893e51 (patch)
tree264c9cc750e08383d4f126a66e6def4176dc2fa9 /OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
parentUpdate svn properties, add copyright headers, minor formatting cleanup. (diff)
downloadopensim-SC-33330297d603a66cc157baa21c81328edc893e51.zip
opensim-SC-33330297d603a66cc157baa21c81328edc893e51.tar.gz
opensim-SC-33330297d603a66cc157baa21c81328edc893e51.tar.bz2
opensim-SC-33330297d603a66cc157baa21c81328edc893e51.tar.xz
THE BIG ANTI-REMOTING SCHLEP -- StartRemoting is no more. Sims in older versions will have a hard time communicating with sims on this release and later, especially if they haven't transitioned to RESTComms at all.
There's still some cleanup to do on assorted data structures, but the main functional change here is that sims no longer listen on remoting ports.
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs16
1 files changed, 0 insertions, 16 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
index 8271829..9a6bd87 100644
--- a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
@@ -99,7 +99,6 @@ namespace OpenSim.Region.Framework.Scenes
99 99
100 m_regionInfo = regionInfos; 100 m_regionInfo = regionInfos;
101 m_commsProvider.GridService.gdebugRegionName = regionInfos.RegionName; 101 m_commsProvider.GridService.gdebugRegionName = regionInfos.RegionName;
102 m_commsProvider.InterRegion.rdebugRegionName = regionInfos.RegionName;
103 regionCommsHost = m_commsProvider.GridService.RegisterRegion(m_regionInfo); 102 regionCommsHost = m_commsProvider.GridService.RegisterRegion(m_regionInfo);
104 103
105 if (regionCommsHost != null) 104 if (regionCommsHost != null)
@@ -1017,16 +1016,6 @@ namespace OpenSim.Region.Framework.Scenes
1017 { 1016 {
1018 return previousNeighbours.FindAll(delegate(ulong handle) { return !currentNeighbours.Contains(handle); }); 1017 return previousNeighbours.FindAll(delegate(ulong handle) { return !currentNeighbours.Contains(handle); });
1019 } 1018 }
1020 /// <summary>
1021 /// Inform a neighbouring region that an avatar is about to cross into it.
1022 /// </summary>
1023 /// <param name="regionhandle"></param>
1024 /// <param name="agentID"></param>
1025 /// <param name="position"></param>
1026 public bool CrossToNeighbouringRegion(ulong regionhandle, UUID agentID, Vector3 position, bool isFlying)
1027 {
1028 return m_commsProvider.InterRegion.ExpectAvatarCrossing(regionhandle, agentID, position, isFlying);
1029 }
1030 1019
1031 public void CrossAgentToNewRegion(Scene scene, ScenePresence agent, bool isFlying) 1020 public void CrossAgentToNewRegion(Scene scene, ScenePresence agent, bool isFlying)
1032 { 1021 {
@@ -1205,11 +1194,6 @@ namespace OpenSim.Region.Framework.Scenes
1205 } 1194 }
1206 1195
1207 1196
1208 public bool PrimCrossToNeighboringRegion(ulong regionhandle, UUID primID, string objData, int XMLMethod)
1209 {
1210 return m_commsProvider.InterRegion.InformRegionOfPrimCrossing(regionhandle, primID, objData, XMLMethod);
1211 }
1212
1213 public Dictionary<string, string> GetGridSettings() 1197 public Dictionary<string, string> GetGridSettings()
1214 { 1198 {
1215 return m_commsProvider.GridService.GetGridSettings(); 1199 return m_commsProvider.GridService.GetGridSettings();