aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs')
-rw-r--r--OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs24
1 files changed, 12 insertions, 12 deletions
diff --git a/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs b/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
index 8e1bf37..9f4d89a 100644
--- a/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
@@ -50,7 +50,7 @@ namespace OpenSim.Services.Connectors.Simulation
50 50
51 // we use this dictionary to track the pending updateagent requests, maps URI --> position update 51 // we use this dictionary to track the pending updateagent requests, maps URI --> position update
52 private Dictionary<string,AgentPosition> m_updateAgentQueue = new Dictionary<string,AgentPosition>(); 52 private Dictionary<string,AgentPosition> m_updateAgentQueue = new Dictionary<string,AgentPosition>();
53 53
54 //private GridRegion m_Region; 54 //private GridRegion m_Region;
55 55
56 public SimulationServiceConnector() 56 public SimulationServiceConnector()
@@ -119,7 +119,7 @@ namespace OpenSim.Services.Connectors.Simulation
119 m_log.DebugFormat("[REMOTE SIMULATION CONNECTOR]: Creating agent at {0}", destination.ServerURI); 119 m_log.DebugFormat("[REMOTE SIMULATION CONNECTOR]: Creating agent at {0}", destination.ServerURI);
120 120
121 string uri = destination.ServerURI + AgentPath() + aCircuit.AgentID + "/"; 121 string uri = destination.ServerURI + AgentPath() + aCircuit.AgentID + "/";
122 122
123 try 123 try
124 { 124 {
125 OSDMap args = aCircuit.PackAgentCircuitData(ctx); 125 OSDMap args = aCircuit.PackAgentCircuitData(ctx);
@@ -137,7 +137,7 @@ namespace OpenSim.Services.Connectors.Simulation
137 myipaddress = data["your_ip"].AsString(); 137 myipaddress = data["your_ip"].AsString();
138 return success; 138 return success;
139 } 139 }
140 140
141 // Try the old version, uncompressed 141 // Try the old version, uncompressed
142 result = WebUtil.PostToService(uri, args, 30000, false); 142 result = WebUtil.PostToService(uri, args, 30000, false);
143 143
@@ -155,10 +155,10 @@ namespace OpenSim.Services.Connectors.Simulation
155 return success; 155 return success;
156 } 156 }
157 } 157 }
158 158
159 m_log.WarnFormat( 159 m_log.WarnFormat(
160 "[REMOTE SIMULATION CONNECTOR]: Failed to create agent {0} {1} at remote simulator {2}", 160 "[REMOTE SIMULATION CONNECTOR]: Failed to create agent {0} {1} at remote simulator {2}",
161 aCircuit.firstname, aCircuit.lastname, destination.RegionName); 161 aCircuit.firstname, aCircuit.lastname, destination.RegionName);
162 reason = result["Message"] != null ? result["Message"].AsString() : "error"; 162 reason = result["Message"] != null ? result["Message"].AsString() : "error";
163 return false; 163 return false;
164 } 164 }
@@ -202,8 +202,8 @@ namespace OpenSim.Services.Connectors.Simulation
202 { 202 {
203 if (m_updateAgentQueue.ContainsKey(uri)) 203 if (m_updateAgentQueue.ContainsKey(uri))
204 { 204 {
205 // Another thread is already handling 205 // Another thread is already handling
206 // updates for this simulator, just update 206 // updates for this simulator, just update
207 // the position and return, overwrites are 207 // the position and return, overwrites are
208 // not a problem since we only care about the 208 // not a problem since we only care about the
209 // last update anyway 209 // last update anyway
@@ -304,7 +304,7 @@ namespace OpenSim.Services.Connectors.Simulation
304 OSDMap request = new OSDMap(); 304 OSDMap request = new OSDMap();
305 request.Add("viaTeleport", OSD.FromBoolean(viaTeleport)); 305 request.Add("viaTeleport", OSD.FromBoolean(viaTeleport));
306 request.Add("position", OSD.FromString(position.ToString())); 306 request.Add("position", OSD.FromString(position.ToString()));
307 // To those who still understad this field, we're telling them 307 // To those who still understad this field, we're telling them
308 // the lowest version just to be safe 308 // the lowest version just to be safe
309 request.Add("my_version", OSD.FromString(String.Format("SIMULATION/{0}", VersionInfo.SimulationServiceVersionSupportedMin))); 309 request.Add("my_version", OSD.FromString(String.Format("SIMULATION/{0}", VersionInfo.SimulationServiceVersionSupportedMin)));
310 // New simulation service negotiation 310 // New simulation service negotiation
@@ -374,7 +374,7 @@ namespace OpenSim.Services.Connectors.Simulation
374 m_log.Info("[REMOTE SIMULATION CONNECTOR]: The above web util error was caused by a TP to a sim that doesn't support QUERYACCESS and can be ignored"); 374 m_log.Info("[REMOTE SIMULATION CONNECTOR]: The above web util error was caused by a TP to a sim that doesn't support QUERYACCESS and can be ignored");
375 return true; 375 return true;
376 } 376 }
377 377
378 reason = result["Message"]; 378 reason = result["Message"];
379 } 379 }
380 else 380 else
@@ -410,7 +410,7 @@ namespace OpenSim.Services.Connectors.Simulation
410 { 410 {
411 m_log.WarnFormat("[REMOTE SIMULATION CONNECTOR] QueryAcesss failed with exception; {0}",e.ToString()); 411 m_log.WarnFormat("[REMOTE SIMULATION CONNECTOR] QueryAcesss failed with exception; {0}",e.ToString());
412 } 412 }
413 413
414 return false; 414 return false;
415 } 415 }
416 416
@@ -428,7 +428,7 @@ namespace OpenSim.Services.Connectors.Simulation
428 { 428 {
429 m_log.WarnFormat("[REMOTE SIMULATION CONNECTOR] ReleaseAgent failed with exception; {0}",e.ToString()); 429 m_log.WarnFormat("[REMOTE SIMULATION CONNECTOR] ReleaseAgent failed with exception; {0}",e.ToString());
430 } 430 }
431 431
432 return true; 432 return true;
433 } 433 }
434 434