aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Communications
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-09-07 03:22:33 +0000
committerJustin Clarke Casey2008-09-07 03:22:33 +0000
commit78f831ef5220907e4d50422a5422063921062cf8 (patch)
tree6efd3ce92be0a0594dc14cfe18f888d050391702 /OpenSim/Region/Communications
parent* minor: just minor doc and tidy up (diff)
downloadopensim-SC_OLD-78f831ef5220907e4d50422a5422063921062cf8.zip
opensim-SC_OLD-78f831ef5220907e4d50422a5422063921062cf8.tar.gz
opensim-SC_OLD-78f831ef5220907e4d50422a5422063921062cf8.tar.bz2
opensim-SC_OLD-78f831ef5220907e4d50422a5422063921062cf8.tar.xz
* minor: Clean up of logging messages to make following the client login process easier
* documentation
Diffstat (limited to 'OpenSim/Region/Communications')
-rw-r--r--OpenSim/Region/Communications/OGS1/OGS1GridServices.cs22
1 files changed, 10 insertions, 12 deletions
diff --git a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
index a3bcc26..4443de9 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
@@ -593,7 +593,6 @@ namespace OpenSim.Region.Communications.OGS1
593 return response; 593 return response;
594 } 594 }
595 595
596 // Grid Request Processing
597 /// <summary> 596 /// <summary>
598 /// Received from the user server when a user starts logging in. This call allows 597 /// Received from the user server when a user starts logging in. This call allows
599 /// the region to prepare for direct communication from the client. Sends back an empty 598 /// the region to prepare for direct communication from the client. Sends back an empty
@@ -602,8 +601,7 @@ namespace OpenSim.Region.Communications.OGS1
602 /// <param name="request"></param> 601 /// <param name="request"></param>
603 /// <returns></returns> 602 /// <returns></returns>
604 public XmlRpcResponse ExpectUser(XmlRpcRequest request) 603 public XmlRpcResponse ExpectUser(XmlRpcRequest request)
605 { 604 {
606 m_log.Debug("[CONNECTION DEBUGGING]: Expect User called, starting agent setup ... ");
607 Hashtable requestData = (Hashtable) request.Params[0]; 605 Hashtable requestData = (Hashtable) request.Params[0];
608 AgentCircuitData agentData = new AgentCircuitData(); 606 AgentCircuitData agentData = new AgentCircuitData();
609 agentData.SessionID = new UUID((string) requestData["session_id"]); 607 agentData.SessionID = new UUID((string) requestData["session_id"]);
@@ -613,15 +611,20 @@ namespace OpenSim.Region.Communications.OGS1
613 agentData.AgentID = new UUID((string) requestData["agent_id"]); 611 agentData.AgentID = new UUID((string) requestData["agent_id"]);
614 agentData.circuitcode = Convert.ToUInt32(requestData["circuit_code"]); 612 agentData.circuitcode = Convert.ToUInt32(requestData["circuit_code"]);
615 agentData.CapsPath = (string) requestData["caps_path"]; 613 agentData.CapsPath = (string) requestData["caps_path"];
614 ulong regionHandle = Convert.ToUInt64((string) requestData["regionhandle"]);
615
616 m_log.DebugFormat(
617 "[CLIENT]: Told by user service to prepare for a connection from {0} {1} {2}, circuit {3}",
618 agentData.firstname, agentData.lastname, agentData.AgentID, agentData.circuitcode);
616 619
617 if (requestData.ContainsKey("child_agent") && requestData["child_agent"].Equals("1")) 620 if (requestData.ContainsKey("child_agent") && requestData["child_agent"].Equals("1"))
618 { 621 {
619 m_log.Debug("[CONNECTION DEBUGGING]: Child agent detected"); 622 m_log.Debug("[CLIENT]: Child agent detected");
620 agentData.child = true; 623 agentData.child = true;
621 } 624 }
622 else 625 else
623 { 626 {
624 m_log.Debug("[CONNECTION DEBUGGING]: Main agent detected"); 627 m_log.Debug("[CLIENT]: Main agent detected");
625 agentData.startpos = 628 agentData.startpos =
626 new Vector3((float)Convert.ToDecimal((string)requestData["startpos_x"]), 629 new Vector3((float)Convert.ToDecimal((string)requestData["startpos_x"]),
627 (float)Convert.ToDecimal((string)requestData["startpos_y"]), 630 (float)Convert.ToDecimal((string)requestData["startpos_y"]),
@@ -629,9 +632,6 @@ namespace OpenSim.Region.Communications.OGS1
629 agentData.child = false; 632 agentData.child = false;
630 } 633 }
631 634
632 ulong regionHandle = Convert.ToUInt64((string) requestData["regionhandle"]);
633
634
635 RegionInfo[] regions = m_regionsOnInstance.ToArray(); 635 RegionInfo[] regions = m_regionsOnInstance.ToArray();
636 bool banned = false; 636 bool banned = false;
637 637
@@ -654,7 +654,7 @@ namespace OpenSim.Region.Communications.OGS1
654 654
655 if (banned) 655 if (banned)
656 { 656 {
657 m_log.InfoFormat("[OGS1 GRID SERVICES]: Denying access for user {0} {1} because user is banned",agentData.firstname,agentData.lastname); 657 m_log.InfoFormat("[CLIENT]: Denying access for user {0} {1} because user is banned",agentData.firstname,agentData.lastname);
658 658
659 Hashtable respdata = new Hashtable(); 659 Hashtable respdata = new Hashtable();
660 respdata["success"] = "FALSE"; 660 respdata["success"] = "FALSE";
@@ -663,14 +663,12 @@ namespace OpenSim.Region.Communications.OGS1
663 } 663 }
664 else 664 else
665 { 665 {
666 m_log.Debug("[CONNECTION DEBUGGING]: Triggering welcome for " + agentData.AgentID.ToString() + " into " + regionHandle.ToString());
667 m_localBackend.TriggerExpectUser(regionHandle, agentData); 666 m_localBackend.TriggerExpectUser(regionHandle, agentData);
668 m_log.Info("[OGS1 GRID SERVICES]: Welcoming new user...");
669 Hashtable respdata = new Hashtable(); 667 Hashtable respdata = new Hashtable();
670 respdata["success"] = "TRUE"; 668 respdata["success"] = "TRUE";
671 resp.Value = respdata; 669 resp.Value = respdata;
672
673 } 670 }
671
674 return resp; 672 return resp;
675 } 673 }
676 // Grid Request Processing 674 // Grid Request Processing