diff options
author | Justin Clarke Casey | 2008-03-19 19:25:10 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2008-03-19 19:25:10 +0000 |
commit | 2b78c40d8914bc8a5ec6430768e783bcd234b2f4 (patch) | |
tree | f22eef2253e8c794eede4eef72598a0693c78e03 /OpenSim/Region/Environment/Scenes | |
parent | * Fix for if 782: Locked prims may still be moved by click+drag. (diff) | |
download | opensim-SC-2b78c40d8914bc8a5ec6430768e783bcd234b2f4.zip opensim-SC-2b78c40d8914bc8a5ec6430768e783bcd234b2f4.tar.gz opensim-SC-2b78c40d8914bc8a5ec6430768e783bcd234b2f4.tar.bz2 opensim-SC-2b78c40d8914bc8a5ec6430768e783bcd234b2f4.tar.xz |
* Adding log debugging messages and making others more explicit
* This reveals that the problem with saving scripts in a non-home region in multi-region configurations is due to a CAPS setup issue
* For some reason the client is still using the CAPS on the region it just came from, causing the ScenePresence lookup to fail (since the presence is now, correctly, a child agent).
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/InnerScene.cs | 8 | ||||
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Scene.cs | 37 |
2 files changed, 36 insertions, 9 deletions
diff --git a/OpenSim/Region/Environment/Scenes/InnerScene.cs b/OpenSim/Region/Environment/Scenes/InnerScene.cs index f37d28a..1187c37 100644 --- a/OpenSim/Region/Environment/Scenes/InnerScene.cs +++ b/OpenSim/Region/Environment/Scenes/InnerScene.cs | |||
@@ -724,9 +724,15 @@ namespace OpenSim.Region.Environment.Scenes | |||
724 | { | 724 | { |
725 | if (!presence.IsChildAgent) | 725 | if (!presence.IsChildAgent) |
726 | { | 726 | { |
727 | avatar = presence; | 727 | avatar = presence; |
728 | return true; | 728 | return true; |
729 | } | 729 | } |
730 | else | ||
731 | { | ||
732 | m_log.WarnFormat( | ||
733 | "[INNER SCENE]: Requested avatar {0} could not be found in scene {1} since it is only registered as a child agent!", | ||
734 | avatarId, m_parentScene.RegionInfo.RegionName); | ||
735 | } | ||
730 | } | 736 | } |
731 | 737 | ||
732 | avatar = null; | 738 | avatar = null; |
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs index 6984d8f..e036a3a 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.cs | |||
@@ -1288,7 +1288,10 @@ namespace OpenSim.Region.Environment.Scenes | |||
1288 | /// <param name="child"></param> | 1288 | /// <param name="child"></param> |
1289 | public override void AddNewClient(IClientAPI client, bool child) | 1289 | public override void AddNewClient(IClientAPI client, bool child) |
1290 | { | 1290 | { |
1291 | m_log.Warn("[CONNECTION DEBUGGING]: Creating new client for " + client.AgentId.ToString()); | 1291 | m_log.DebugFormat( |
1292 | "[CONNECTION DEBUGGING]: Creating new client for {0} at {1}", | ||
1293 | client.AgentId, RegionInfo.RegionName); | ||
1294 | |||
1292 | SubscribeToClientEvents(client); | 1295 | SubscribeToClientEvents(client); |
1293 | ScenePresence presence = null; | 1296 | ScenePresence presence = null; |
1294 | 1297 | ||
@@ -1637,7 +1640,8 @@ namespace OpenSim.Region.Environment.Scenes | |||
1637 | 1640 | ||
1638 | 1641 | ||
1639 | /// <summary> | 1642 | /// <summary> |
1640 | /// | 1643 | /// Do the work necessary to initiate a new user connection. |
1644 | /// At the moment, this consists of setting up the caps infrastructure | ||
1641 | /// </summary> | 1645 | /// </summary> |
1642 | /// <param name="regionHandle"></param> | 1646 | /// <param name="regionHandle"></param> |
1643 | /// <param name="agent"></param> | 1647 | /// <param name="agent"></param> |
@@ -1647,7 +1651,10 @@ namespace OpenSim.Region.Environment.Scenes | |||
1647 | { | 1651 | { |
1648 | if (agent.CapsPath != String.Empty) | 1652 | if (agent.CapsPath != String.Empty) |
1649 | { | 1653 | { |
1650 | m_log.Debug("[CONNECTION DEBUGGING]: Setting up CAPS handler for " + agent.AgentID.ToString() + " at " + agent.CapsPath.ToString()); | 1654 | m_log.DebugFormat( |
1655 | "[CONNECTION DEBUGGING]: Setting up CAPS handler for avatar {0} at {1} in {2}", | ||
1656 | agent.AgentID, agent.CapsPath, RegionInfo.RegionName); | ||
1657 | |||
1651 | Caps cap = | 1658 | Caps cap = |
1652 | new Caps(AssetCache, m_httpListener, m_regInfo.ExternalHostName, m_httpListener.Port, | 1659 | new Caps(AssetCache, m_httpListener, m_regInfo.ExternalHostName, m_httpListener.Port, |
1653 | agent.CapsPath, agent.AgentID, m_dumpAssetsToFile); | 1660 | agent.CapsPath, agent.AgentID, m_dumpAssetsToFile); |
@@ -1667,14 +1674,20 @@ namespace OpenSim.Region.Environment.Scenes | |||
1667 | 1674 | ||
1668 | if (m_capsHandlers.ContainsKey(agent.AgentID)) | 1675 | if (m_capsHandlers.ContainsKey(agent.AgentID)) |
1669 | { | 1676 | { |
1670 | m_log.Debug("[CONNECTION DEBUGGING]: Caps path already in use for " + agent.AgentID.ToString()); | 1677 | m_log.DebugFormat( |
1678 | "[CONNECTION DEBUGGING]: Caps path already in use for avatar {0} in region {1}", | ||
1679 | agent.AgentID, RegionInfo.RegionName); | ||
1680 | |||
1671 | try | 1681 | try |
1672 | { | 1682 | { |
1673 | m_capsHandlers[agent.AgentID] = cap; | 1683 | m_capsHandlers[agent.AgentID] = cap; |
1674 | } | 1684 | } |
1675 | catch (KeyNotFoundException) | 1685 | catch (KeyNotFoundException) |
1676 | { | 1686 | { |
1677 | m_log.Debug("[CONNECTION DEBUGGING]: Caught exception adding handler for " + agent.AgentID.ToString()); | 1687 | m_log.DebugFormat( |
1688 | "[CONNECTION DEBUGGING]: Caught exception adding handler for avatar {0} at {1}", | ||
1689 | agent.AgentID, RegionInfo.RegionName); | ||
1690 | |||
1678 | // Fix for a potential race condition. | 1691 | // Fix for a potential race condition. |
1679 | m_capsHandlers.Add(agent.AgentID, cap); | 1692 | m_capsHandlers.Add(agent.AgentID, cap); |
1680 | } | 1693 | } |
@@ -1686,14 +1699,22 @@ namespace OpenSim.Region.Environment.Scenes | |||
1686 | } | 1699 | } |
1687 | else | 1700 | else |
1688 | { | 1701 | { |
1689 | m_log.Warn("[CONNECTION DEBUGGING]: Skipped setting up CAPS handler for " + agent.AgentID.ToString()); | 1702 | m_log.WarnFormat( |
1703 | "[CONNECTION DEBUGGING]: Skipped setting up CAPS handler for avatar {0} at {1}", | ||
1704 | agent.AgentID, RegionInfo.RegionName); | ||
1690 | } | 1705 | } |
1691 | m_log.Debug("[CONNECTION DEBUGGING]: Creating new circuit code (" + agent.circuitcode.ToString() + ") for " + agent.AgentID.ToString()); | 1706 | |
1707 | m_log.DebugFormat( | ||
1708 | "[CONNECTION DEBUGGING]: Creating new circuit code ({0}) for avatar {1} at {2}", | ||
1709 | agent.circuitcode, agent.AgentID, RegionInfo.RegionName); | ||
1710 | |||
1692 | m_authenticateHandler.AddNewCircuit(agent.circuitcode, agent); | 1711 | m_authenticateHandler.AddNewCircuit(agent.circuitcode, agent); |
1693 | } | 1712 | } |
1694 | else | 1713 | else |
1695 | { | 1714 | { |
1696 | m_log.Warn("[CONNECTION DEBUGGING]: Skipping this region for welcoming " + agent.AgentID.ToString() + " [" + regionHandle.ToString() + "]"); | 1715 | m_log.WarnFormat( |
1716 | "[CONNECTION DEBUGGING]: Skipping this region for welcoming avatar {0} [{1}] at {2}", | ||
1717 | agent.AgentID, regionHandle, RegionInfo.RegionName); | ||
1697 | } | 1718 | } |
1698 | } | 1719 | } |
1699 | 1720 | ||