aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
diff options
context:
space:
mode:
authorJeff Ames2008-09-09 01:26:48 +0000
committerJeff Ames2008-09-09 01:26:48 +0000
commitfae34bb10cfa10702faf5c19d8c8517faa018cb5 (patch)
tree2001f24703b010957254dbb49ef5e222ff30b84d /OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
parentFix state xxx within state xxx itself triggering a state "change" to (diff)
downloadopensim-SC-fae34bb10cfa10702faf5c19d8c8517faa018cb5.zip
opensim-SC-fae34bb10cfa10702faf5c19d8c8517faa018cb5.tar.gz
opensim-SC-fae34bb10cfa10702faf5c19d8c8517faa018cb5.tar.bz2
opensim-SC-fae34bb10cfa10702faf5c19d8c8517faa018cb5.tar.xz
Update svn properties, formatting cleanup.
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Communications/OGS1/OGS1GridServices.cs10
1 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
index 2538eaf..3bd57cd 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
@@ -89,7 +89,7 @@ namespace OpenSim.Region.Communications.OGS1
89 { 89 {
90 serversInfo = servers_info; 90 serversInfo = servers_info;
91 httpServer = httpServe; 91 httpServer = httpServe;
92 92
93 //Respond to Grid Services requests 93 //Respond to Grid Services requests
94 httpServer.AddXmlRPCHandler("expect_user", ExpectUser); 94 httpServer.AddXmlRPCHandler("expect_user", ExpectUser);
95 httpServer.AddXmlRPCHandler("logoff_user", LogOffUser); 95 httpServer.AddXmlRPCHandler("logoff_user", LogOffUser);
@@ -602,7 +602,7 @@ namespace OpenSim.Region.Communications.OGS1
602 /// <param name="request"></param> 602 /// <param name="request"></param>
603 /// <returns></returns> 603 /// <returns></returns>
604 public XmlRpcResponse ExpectUser(XmlRpcRequest request) 604 public XmlRpcResponse ExpectUser(XmlRpcRequest request)
605 { 605 {
606 Hashtable requestData = (Hashtable) request.Params[0]; 606 Hashtable requestData = (Hashtable) request.Params[0];
607 AgentCircuitData agentData = new AgentCircuitData(); 607 AgentCircuitData agentData = new AgentCircuitData();
608 agentData.SessionID = new UUID((string) requestData["session_id"]); 608 agentData.SessionID = new UUID((string) requestData["session_id"]);
@@ -613,7 +613,7 @@ namespace OpenSim.Region.Communications.OGS1
613 agentData.circuitcode = Convert.ToUInt32(requestData["circuit_code"]); 613 agentData.circuitcode = Convert.ToUInt32(requestData["circuit_code"]);
614 agentData.CapsPath = (string) requestData["caps_path"]; 614 agentData.CapsPath = (string) requestData["caps_path"];
615 ulong regionHandle = Convert.ToUInt64((string) requestData["regionhandle"]); 615 ulong regionHandle = Convert.ToUInt64((string) requestData["regionhandle"]);
616 616
617 m_log.DebugFormat( 617 m_log.DebugFormat(
618 "[CLIENT]: Told by user service to prepare for a connection from {0} {1} {2}, circuit {3}", 618 "[CLIENT]: Told by user service to prepare for a connection from {0} {1} {2}, circuit {3}",
619 agentData.firstname, agentData.lastname, agentData.AgentID, agentData.circuitcode); 619 agentData.firstname, agentData.lastname, agentData.AgentID, agentData.circuitcode);
@@ -669,7 +669,7 @@ namespace OpenSim.Region.Communications.OGS1
669 respdata["success"] = "TRUE"; 669 respdata["success"] = "TRUE";
670 resp.Value = respdata; 670 resp.Value = respdata;
671 } 671 }
672 672
673 return resp; 673 return resp;
674 } 674 }
675 // Grid Request Processing 675 // Grid Request Processing
@@ -1679,7 +1679,7 @@ namespace OpenSim.Region.Communications.OGS1
1679 // this might be cached, as we probably requested it just a moment ago... 1679 // this might be cached, as we probably requested it just a moment ago...
1680 RegionInfo info = RequestNeighbourInfo(regionHandle); 1680 RegionInfo info = RequestNeighbourInfo(regionHandle);
1681 if (info != null) // just to be sure 1681 if (info != null) // just to be sure
1682 { 1682 {
1683 XmlRpcRequest request = new XmlRpcRequest("land_data", paramList); 1683 XmlRpcRequest request = new XmlRpcRequest("land_data", paramList);
1684 string uri = "http://" + info.ExternalEndPoint.Address + ":" + info.HttpPort + "/"; 1684 string uri = "http://" + info.ExternalEndPoint.Address + ":" + info.HttpPort + "/";
1685 XmlRpcResponse response = request.Send(uri, 10000); 1685 XmlRpcResponse response = request.Send(uri, 10000);