diff options
author | John Hurliman | 2010-02-23 00:59:24 -0800 |
---|---|---|
committer | John Hurliman | 2010-02-23 00:59:24 -0800 |
commit | d506449f6765ec7372615ffd4afefb0075d94af4 (patch) | |
tree | 77e9ad59962fa0625cd2a8212339898005a067d5 /OpenSim/Region | |
parent | * Removed the broken and unused GridRegion.ExternalEndPoint setter (diff) | |
download | opensim-SC_OLD-d506449f6765ec7372615ffd4afefb0075d94af4.zip opensim-SC_OLD-d506449f6765ec7372615ffd4afefb0075d94af4.tar.gz opensim-SC_OLD-d506449f6765ec7372615ffd4afefb0075d94af4.tar.bz2 opensim-SC_OLD-d506449f6765ec7372615ffd4afefb0075d94af4.tar.xz |
* Removed the unused GridRegion.getInternalEndPointPort() (just use InternalEndPoint.Port). This class is complex enough as it is
* Changed the failed to inform neighbor message from a warning to info, since this will fire for every empty neighbor space
* Made the EnableSimulator/EstablishAgentCommunication log message more verbose and more clear about what is happening
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | 6 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs | 2 |
2 files changed, 5 insertions, 3 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 | ||