aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2011-11-19 01:16:07 +0000
committerJustin Clark-Casey (justincc)2011-11-19 01:16:07 +0000
commit10a23a823edb261af2c0b7895ce0898ea6918ef1 (patch)
tree9c3af81fea9986b58964fe3276ac337497a13435
parentEnable v2/v3 map tile url setting on robust as default in config (diff)
downloadopensim-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/Data/IRegionData.cs4
-rw-r--r--OpenSim/Framework/WebUtil.cs2
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs8
-rw-r--r--OpenSim/Server/Handlers/Simulation/AgentHandlers.cs3
-rw-r--r--OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs2
-rw-r--r--OpenSim/Services/GridService/GridService.cs4
6 files changed, 13 insertions, 10 deletions
diff --git a/OpenSim/Data/IRegionData.cs b/OpenSim/Data/IRegionData.cs
index 0068daa..546b5e8 100644
--- a/OpenSim/Data/IRegionData.cs
+++ b/OpenSim/Data/IRegionData.cs
@@ -54,12 +54,12 @@ namespace OpenSim.Data
54 /// <summary> 54 /// <summary>
55 /// Return the x-coordinate of this region. 55 /// Return the x-coordinate of this region.
56 /// </summary> 56 /// </summary>
57 public int coordX { get { return (sizeX != 0) ? posX / (int)Constants.RegionSize : -1; } } 57 public int coordX { get { return posX / (int)Constants.RegionSize; } }
58 58
59 /// <summary> 59 /// <summary>
60 /// Return the y-coordinate of this region. 60 /// Return the y-coordinate of this region.
61 /// </summary> 61 /// </summary>
62 public int coordY { get { return (sizeY != 0) ? posY / (int)Constants.RegionSize : -1; } } 62 public int coordY { get { return posY / (int)Constants.RegionSize; } }
63 63
64 public Dictionary<string, object> Data; 64 public Dictionary<string, object> Data;
65 } 65 }
diff --git a/OpenSim/Framework/WebUtil.cs b/OpenSim/Framework/WebUtil.cs
index cafa441..c6be79e 100644
--- a/OpenSim/Framework/WebUtil.cs
+++ b/OpenSim/Framework/WebUtil.cs
@@ -297,7 +297,7 @@ namespace OpenSim.Framework
297 catch (Exception e) 297 catch (Exception e)
298 { 298 {
299 // don't need to treat this as an error... we're just guessing anyway 299 // don't need to treat this as an error... we're just guessing anyway
300 m_log.DebugFormat("[WEB UTIL] couldn't decode <{0}>: {1}",response,e.Message); 300// m_log.DebugFormat("[WEB UTIL] couldn't decode <{0}>: {1}",response,e.Message);
301 } 301 }
302 302
303 return result; 303 return result;
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
diff --git a/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs b/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
index e8ae05b..b65a443 100644
--- a/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
+++ b/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
@@ -220,14 +220,13 @@ namespace OpenSim.Server.Handlers.Simulation
220 responsedata["int_response_code"] = HttpStatusCode.OK; 220 responsedata["int_response_code"] = HttpStatusCode.OK;
221 responsedata["str_response_string"] = "OpenSim agent " + id.ToString(); 221 responsedata["str_response_string"] = "OpenSim agent " + id.ToString();
222 222
223 m_log.Debug("[AGENT HANDLER]: Agent Released/Deleted."); 223 m_log.DebugFormat("[AGENT HANDLER]: Agent {0} Released/Deleted from region {1}", id, regionID);
224 } 224 }
225 225
226 protected virtual void ReleaseAgent(UUID regionID, UUID id) 226 protected virtual void ReleaseAgent(UUID regionID, UUID id)
227 { 227 {
228 m_SimulationService.ReleaseAgent(regionID, id, ""); 228 m_SimulationService.ReleaseAgent(regionID, id, "");
229 } 229 }
230
231 } 230 }
232 231
233 public class AgentPostHandler : BaseStreamHandler 232 public class AgentPostHandler : BaseStreamHandler
diff --git a/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs b/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
index 7cbd361..c45f456 100644
--- a/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
@@ -369,7 +369,7 @@ namespace OpenSim.Services.Connectors.Simulation
369 /// </summary> 369 /// </summary>
370 public bool CloseAgent(GridRegion destination, UUID id) 370 public bool CloseAgent(GridRegion destination, UUID id)
371 { 371 {
372 // m_log.DebugFormat("[REMOTE SIMULATION CONNECTOR]: CloseAgent start"); 372// m_log.DebugFormat("[REMOTE SIMULATION CONNECTOR]: CloseAgent start");
373 373
374 string uri = destination.ServerURI + AgentPath() + id + "/" + destination.RegionID.ToString() + "/"; 374 string uri = destination.ServerURI + AgentPath() + id + "/" + destination.RegionID.ToString() + "/";
375 375
diff --git a/OpenSim/Services/GridService/GridService.cs b/OpenSim/Services/GridService/GridService.cs
index eae10e8..89f0716 100644
--- a/OpenSim/Services/GridService/GridService.cs
+++ b/OpenSim/Services/GridService/GridService.cs
@@ -249,7 +249,7 @@ namespace OpenSim.Services.GridService
249 return false; 249 return false;
250 250
251 m_log.DebugFormat( 251 m_log.DebugFormat(
252 "[GRID SERVICE]: Degistering region {0} ({1}) at {2}-{3}", 252 "[GRID SERVICE]: Deregistering region {0} ({1}) at {2}-{3}",
253 region.RegionName, region.RegionID, region.coordX, region.coordY); 253 region.RegionName, region.RegionID, region.coordX, region.coordY);
254 254
255 int flags = Convert.ToInt32(region.Data["flags"]); 255 int flags = Convert.ToInt32(region.Data["flags"]);
@@ -296,7 +296,7 @@ namespace OpenSim.Services.GridService
296 } 296 }
297 } 297 }
298 298
299 m_log.DebugFormat("[GRID SERVICE]: region {0} has {1} neighbours", region.RegionName, rinfos.Count); 299// m_log.DebugFormat("[GRID SERVICE]: region {0} has {1} neighbours", region.RegionName, rinfos.Count);
300 } 300 }
301 else 301 else
302 { 302 {