diff options
author | Adam Frisby | 2008-02-08 17:49:53 +0000 |
---|---|---|
committer | Adam Frisby | 2008-02-08 17:49:53 +0000 |
commit | a637473f80e6695326ec2d9d6050df37e0d74a2d (patch) | |
tree | 97293aabdc7e4e11dccbf78b31cf1e78a0d38bb4 /OpenSim/Region/Environment/Scenes/Scene.cs | |
parent | change counter from 3 => 2 based on feedback from mirceakitsune on mantis (diff) | |
download | opensim-SC_OLD-a637473f80e6695326ec2d9d6050df37e0d74a2d.zip opensim-SC_OLD-a637473f80e6695326ec2d9d6050df37e0d74a2d.tar.gz opensim-SC_OLD-a637473f80e6695326ec2d9d6050df37e0d74a2d.tar.bz2 opensim-SC_OLD-a637473f80e6695326ec2d9d6050df37e0d74a2d.tar.xz |
* Adding console spam to help track 'The Steve Bug'.
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/Scene.cs')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Scene.cs | 18 |
1 files changed, 14 insertions, 4 deletions
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> |