aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/Connectors
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Services/Connectors')
-rw-r--r--OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs13
1 files changed, 11 insertions, 2 deletions
diff --git a/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs b/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
index fcf07c7..dc532d0 100644
--- a/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
@@ -39,6 +39,7 @@ using GridRegion = OpenSim.Services.Interfaces.GridRegion;
39using OpenMetaverse; 39using OpenMetaverse;
40using OpenMetaverse.StructuredData; 40using OpenMetaverse.StructuredData;
41using log4net; 41using log4net;
42using Nini.Config;
42 43
43namespace OpenSim.Services.Connectors.Simulation 44namespace OpenSim.Services.Connectors.Simulation
44{ 45{
@@ -52,7 +53,7 @@ namespace OpenSim.Services.Connectors.Simulation
52 { 53 {
53 } 54 }
54 55
55 public SimulationServiceConnector(GridRegion region) 56 public SimulationServiceConnector(IConfigSource config)
56 { 57 {
57 //m_Region = region; 58 //m_Region = region;
58 } 59 }
@@ -68,6 +69,13 @@ namespace OpenSim.Services.Connectors.Simulation
68 { 69 {
69 reason = String.Empty; 70 reason = String.Empty;
70 71
72 if (destination == null)
73 {
74 reason = "Destination is null";
75 m_log.Debug("[REMOTE SIMULATION CONNECTOR]: Given destination is null");
76 return false;
77 }
78
71 // Eventually, we want to use a caps url instead of the agentID 79 // Eventually, we want to use a caps url instead of the agentID
72 string uri = string.Empty; 80 string uri = string.Empty;
73 try 81 try
@@ -128,7 +136,8 @@ namespace OpenSim.Services.Connectors.Simulation
128 AgentCreateRequest.ContentLength = buffer.Length; //Count bytes to send 136 AgentCreateRequest.ContentLength = buffer.Length; //Count bytes to send
129 os = AgentCreateRequest.GetRequestStream(); 137 os = AgentCreateRequest.GetRequestStream();
130 os.Write(buffer, 0, strBuffer.Length); //Send it 138 os.Write(buffer, 0, strBuffer.Length); //Send it
131 //m_log.InfoFormat("[REMOTE SIMULATION CONNECTOR]: Posted CreateChildAgent request to remote sim {0}", uri); 139 m_log.InfoFormat("[REMOTE SIMULATION CONNECTOR]: Posted CreateAgent request to remote sim {0}, region {1}, x={2} y={3}",
140 uri, destination.RegionName, destination.RegionLocX, destination.RegionLocY);
132 } 141 }
133 //catch (WebException ex) 142 //catch (WebException ex)
134 catch 143 catch