aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim/Region/Communications/OGS1/OGS1GridServices.cs5
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs18
2 files changed, 18 insertions, 5 deletions
diff --git a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
index fb84466..29f5472 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
@@ -456,7 +456,7 @@ namespace OpenSim.Region.Communications.OGS1
456 /// <returns></returns> 456 /// <returns></returns>
457 public XmlRpcResponse ExpectUser(XmlRpcRequest request) 457 public XmlRpcResponse ExpectUser(XmlRpcRequest request)
458 { 458 {
459 Console.WriteLine("Expecting User..."); 459 m_log.Debug("[CONNECTION DEBUGGING]: Expect User called, starting agent setup ... ");
460 Hashtable requestData = (Hashtable) request.Params[0]; 460 Hashtable requestData = (Hashtable) request.Params[0];
461 AgentCircuitData agentData = new AgentCircuitData(); 461 AgentCircuitData agentData = new AgentCircuitData();
462 agentData.SessionID = new LLUUID((string) requestData["session_id"]); 462 agentData.SessionID = new LLUUID((string) requestData["session_id"]);
@@ -469,10 +469,12 @@ namespace OpenSim.Region.Communications.OGS1
469 469
470 if (requestData.ContainsKey("child_agent") && requestData["child_agent"].Equals("1")) 470 if (requestData.ContainsKey("child_agent") && requestData["child_agent"].Equals("1"))
471 { 471 {
472 m_log.Debug("[CONNECTION DEBUGGING]: Child agent detected");
472 agentData.child = true; 473 agentData.child = true;
473 } 474 }
474 else 475 else
475 { 476 {
477 m_log.Debug("[CONNECTION DEBUGGING]: Main agent detected");
476 agentData.startpos = 478 agentData.startpos =
477 new LLVector3(Convert.ToUInt32(requestData["startpos_x"]), 479 new LLVector3(Convert.ToUInt32(requestData["startpos_x"]),
478 Convert.ToUInt32(requestData["startpos_y"]), 480 Convert.ToUInt32(requestData["startpos_y"]),
@@ -482,6 +484,7 @@ namespace OpenSim.Region.Communications.OGS1
482 484
483 ulong regionHandle = Convert.ToUInt64((string) requestData["regionhandle"]); 485 ulong regionHandle = Convert.ToUInt64((string) requestData["regionhandle"]);
484 486
487 m_log.Debug("[CONNECTION DEBUGGING]: Triggering welcome for " + agentData.AgentID.ToString() + " into " + regionHandle.ToString());
485 m_localBackend.TriggerExpectUser(regionHandle, agentData); 488 m_localBackend.TriggerExpectUser(regionHandle, agentData);
486 489
487 m_log.Info("[GRID]: Welcoming new user..."); 490 m_log.Info("[GRID]: Welcoming new user...");
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index dd1c538..bd7f59d 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -1241,6 +1241,7 @@ namespace OpenSim.Region.Environment.Scenes
1241 /// <param name="child"></param> 1241 /// <param name="child"></param>
1242 public override void AddNewClient(IClientAPI client, bool child) 1242 public override void AddNewClient(IClientAPI client, bool child)
1243 { 1243 {
1244 m_log.Warn("[CONNECTION DEBUGGING]: Creating new client for " + client.AgentId.ToString());
1244 SubscribeToClientEvents(client); 1245 SubscribeToClientEvents(client);
1245 1246
1246 m_estateManager.sendRegionHandshake(client); 1247 m_estateManager.sendRegionHandshake(client);
@@ -1516,6 +1517,7 @@ namespace OpenSim.Region.Environment.Scenes
1516 { 1517 {
1517 if (agent.CapsPath != String.Empty) 1518 if (agent.CapsPath != String.Empty)
1518 { 1519 {
1520 m_log.Debug("[CONNECTION DEBUGGING]: Setting up CAPS handler for " + agent.AgentID.ToString() + " at " + agent.CapsPath.ToString());
1519 Caps cap = 1521 Caps cap =
1520 new Caps(AssetCache, httpListener, m_regInfo.ExternalHostName, httpListener.Port, 1522 new Caps(AssetCache, httpListener, m_regInfo.ExternalHostName, httpListener.Port,
1521 agent.CapsPath, agent.AgentID, m_dumpAssetsToFile); 1523 agent.CapsPath, agent.AgentID, m_dumpAssetsToFile);
@@ -1526,7 +1528,7 @@ namespace OpenSim.Region.Environment.Scenes
1526 cap.RegisterHandlers(); 1528 cap.RegisterHandlers();
1527 if (agent.child) 1529 if (agent.child)
1528 { 1530 {
1529 1531
1530 } 1532 }
1531 cap.AddNewInventoryItem = AddInventoryItem; 1533 cap.AddNewInventoryItem = AddInventoryItem;
1532 cap.ItemUpdatedCall = CapsUpdateInventoryItemAsset; 1534 cap.ItemUpdatedCall = CapsUpdateInventoryItemAsset;
@@ -1534,14 +1536,14 @@ namespace OpenSim.Region.Environment.Scenes
1534 1536
1535 if (m_capsHandlers.ContainsKey(agent.AgentID)) 1537 if (m_capsHandlers.ContainsKey(agent.AgentID))
1536 { 1538 {
1537 //m_log.Warn("[client]: Adding duplicate CAPS entry for user " + 1539 m_log.Debug("[CONNECTION DEBUGGING]: Caps path already in use for " + agent.AgentID.ToString());
1538 // agent.AgentID.ToString());
1539 try 1540 try
1540 { 1541 {
1541 m_capsHandlers[agent.AgentID] = cap; 1542 m_capsHandlers[agent.AgentID] = cap;
1542 } 1543 }
1543 catch (KeyNotFoundException) 1544 catch (KeyNotFoundException)
1544 { 1545 {
1546 m_log.Debug("[CONNECTION DEBUGGING]: Caught exception adding handler for " + agent.AgentID.ToString());
1545 // Fix for a potential race condition. 1547 // Fix for a potential race condition.
1546 m_capsHandlers.Add(agent.AgentID, cap); 1548 m_capsHandlers.Add(agent.AgentID, cap);
1547 } 1549 }
@@ -1551,9 +1553,17 @@ namespace OpenSim.Region.Environment.Scenes
1551 m_capsHandlers.Add(agent.AgentID, cap); 1553 m_capsHandlers.Add(agent.AgentID, cap);
1552 } 1554 }
1553 } 1555 }
1554 m_log.Debug("[client]: Creating agent circuit"); 1556 else
1557 {
1558 m_log.Warn("[CONNECTION DEBUGGING]: Skipped setting up CAPS handler for " + agent.AgentID.ToString());
1559 }
1560 m_log.Debug("[CONNECTION DEBUGGING]: Creating new circuit code (" + agent.circuitcode.ToString() + ") for " + agent.AgentID.ToString());
1555 m_authenticateHandler.AddNewCircuit(agent.circuitcode, agent); 1561 m_authenticateHandler.AddNewCircuit(agent.circuitcode, agent);
1556 } 1562 }
1563 else
1564 {
1565 m_log.Warn("[CONNECTION DEBUGGING]: Skipping this region for welcoming " + agent.AgentID.ToString() + " [" + regionHandle.ToString() + "]");
1566 }
1557 } 1567 }
1558 1568
1559 /// <summary> 1569 /// <summary>