diff options
author | Justin Clark-Casey (justincc) | 2011-11-19 01:16:07 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2011-11-19 01:16:07 +0000 |
commit | 10a23a823edb261af2c0b7895ce0898ea6918ef1 (patch) | |
tree | 9c3af81fea9986b58964fe3276ac337497a13435 /OpenSim/Region/Framework/Scenes | |
parent | Enable v2/v3 map tile url setting on robust as default in config (diff) | |
download | opensim-SC_OLD-10a23a823edb261af2c0b7895ce0898ea6918ef1.zip opensim-SC_OLD-10a23a823edb261af2c0b7895ce0898ea6918ef1.tar.gz opensim-SC_OLD-10a23a823edb261af2c0b7895ce0898ea6918ef1.tar.bz2 opensim-SC_OLD-10a23a823edb261af2c0b7895ce0898ea6918ef1.tar.xz |
Get rid of the spurious [WEB UTIL] couldn't decode <OpenSim agent 57956c4b-ff2e-4fc1-9995-613c6256cc98>: Invalid character 'O' in input string messages
These are just the result of an attempt to canonicalize received messages - it's not important that we constantly log them.
Also finally get the deregister grid service message working properly
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs index 0e22156..d76ed3e 100644 --- a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs +++ b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs | |||
@@ -174,7 +174,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
174 | { | 174 | { |
175 | // We're ignoring a collection was modified error because this data gets old and outdated fast. | 175 | // We're ignoring a collection was modified error because this data gets old and outdated fast. |
176 | } | 176 | } |
177 | |||
178 | } | 177 | } |
179 | 178 | ||
180 | /// <summary> | 179 | /// <summary> |
@@ -182,13 +181,18 @@ namespace OpenSim.Region.Framework.Scenes | |||
182 | /// </summary> | 181 | /// </summary> |
183 | protected void SendCloseChildAgent(UUID agentID, ulong regionHandle) | 182 | protected void SendCloseChildAgent(UUID agentID, ulong regionHandle) |
184 | { | 183 | { |
185 | m_log.Debug("[INTERGRID]: Sending close agent to " + regionHandle); | ||
186 | // let's do our best, but there's not much we can do if the neighbour doesn't accept. | 184 | // let's do our best, but there's not much we can do if the neighbour doesn't accept. |
187 | 185 | ||
188 | //m_commsProvider.InterRegion.TellRegionToCloseChildConnection(regionHandle, agentID); | 186 | //m_commsProvider.InterRegion.TellRegionToCloseChildConnection(regionHandle, agentID); |
189 | uint x = 0, y = 0; | 187 | uint x = 0, y = 0; |
190 | Utils.LongToUInts(regionHandle, out x, out y); | 188 | Utils.LongToUInts(regionHandle, out x, out y); |
189 | |||
191 | GridRegion destination = m_scene.GridService.GetRegionByPosition(m_regionInfo.ScopeID, (int)x, (int)y); | 190 | GridRegion destination = m_scene.GridService.GetRegionByPosition(m_regionInfo.ScopeID, (int)x, (int)y); |
191 | |||
192 | m_log.DebugFormat( | ||
193 | "[INTERGRID]: Sending close agent {0} to region at {1}-{2}", | ||
194 | agentID, destination.RegionCoordX, destination.RegionCoordY); | ||
195 | |||
192 | m_scene.SimulationService.CloseAgent(destination, agentID); | 196 | m_scene.SimulationService.CloseAgent(destination, agentID); |
193 | } | 197 | } |
194 | 198 | ||