aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs6
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs2
-rw-r--r--OpenSim/Services/Interfaces/IGridService.cs5
3 files changed, 5 insertions, 8 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
index 53de269..80c0af8 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
@@ -1120,10 +1120,12 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
1120 } 1120 }
1121 #endregion 1121 #endregion
1122 1122
1123 m_log.DebugFormat("[ENTITY TRANSFER MODULE]: {0} is sending {1} EnableSimulator for neighbor region {2} @ {3} " +
1124 "and EstablishAgentCommunication with seed cap {4}",
1125 m_scene.RegionInfo.RegionName, sp.Name, reg.RegionName, reg.RegionHandle, capsPath);
1126
1123 eq.EnableSimulator(reg.RegionHandle, endPoint, sp.UUID); 1127 eq.EnableSimulator(reg.RegionHandle, endPoint, sp.UUID);
1124 eq.EstablishAgentCommunication(sp.UUID, endPoint, capsPath); 1128 eq.EstablishAgentCommunication(sp.UUID, endPoint, capsPath);
1125 m_log.DebugFormat("[ENTITY TRANSFER MODULE]: Sending new CAPS seed url {0} to client {1} in region {2}",
1126 capsPath, sp.UUID, sp.Scene.RegionInfo.RegionName);
1127 } 1129 }
1128 else 1130 else
1129 { 1131 {
diff --git a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
index f1813a5..e87f7ca 100644
--- a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
@@ -173,7 +173,7 @@ namespace OpenSim.Region.Framework.Scenes
173 } 173 }
174 else 174 else
175 { 175 {
176 m_log.WarnFormat("[INTERGRID]: Failed to inform neighbour {0}-{1} that I'm here.", x / Constants.RegionSize, y / Constants.RegionSize); 176 m_log.InfoFormat("[INTERGRID]: Failed to inform neighbour {0}-{1} that I'm here.", x / Constants.RegionSize, y / Constants.RegionSize);
177 } 177 }
178 } 178 }
179 179
diff --git a/OpenSim/Services/Interfaces/IGridService.cs b/OpenSim/Services/Interfaces/IGridService.cs
index ad49522..e55b633 100644
--- a/OpenSim/Services/Interfaces/IGridService.cs
+++ b/OpenSim/Services/Interfaces/IGridService.cs
@@ -285,11 +285,6 @@ namespace OpenSim.Services.Interfaces
285 get { return Util.UIntsToLong((uint)RegionLocX, (uint)RegionLocY); } 285 get { return Util.UIntsToLong((uint)RegionLocX, (uint)RegionLocY); }
286 } 286 }
287 287
288 public int getInternalEndPointPort()
289 {
290 return m_internalEndPoint.Port;
291 }
292
293 public Dictionary<string, object> ToKeyValuePairs() 288 public Dictionary<string, object> ToKeyValuePairs()
294 { 289 {
295 Dictionary<string, object> kvp = new Dictionary<string, object>(); 290 Dictionary<string, object> kvp = new Dictionary<string, object>();