diff options
author | Justin Clarke Casey | 2008-03-25 22:04:41 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2008-03-25 22:04:41 +0000 |
commit | ad6783ff40a1e3edd3895ffa8b9d8a8f0d72657f (patch) | |
tree | 40c7d225458b38cb23e0fe7ce28b4aa972a2e412 /OpenSim/Region | |
parent | * Print out the exception stacks of resolution failures, temporarily (diff) | |
download | opensim-SC-ad6783ff40a1e3edd3895ffa8b9d8a8f0d72657f.zip opensim-SC-ad6783ff40a1e3edd3895ffa8b9d8a8f0d72657f.tar.gz opensim-SC-ad6783ff40a1e3edd3895ffa8b9d8a8f0d72657f.tar.bz2 opensim-SC-ad6783ff40a1e3edd3895ffa8b9d8a8f0d72657f.tar.xz |
* Massaging CAPS setup/teardown log messages
* Leaving quite a few debug messages in for now to help deal with bugs arising
Diffstat (limited to '')
4 files changed, 11 insertions, 7 deletions
diff --git a/OpenSim/Region/Communications/Local/LocalLoginService.cs b/OpenSim/Region/Communications/Local/LocalLoginService.cs index 3eac7e9..6f12601 100644 --- a/OpenSim/Region/Communications/Local/LocalLoginService.cs +++ b/OpenSim/Region/Communications/Local/LocalLoginService.cs | |||
@@ -159,7 +159,11 @@ namespace OpenSim.Region.Communications.Local | |||
159 | 159 | ||
160 | response.SeedCapability = "http://" + reg.ExternalHostName + ":" + | 160 | response.SeedCapability = "http://" + reg.ExternalHostName + ":" + |
161 | serversInfo.HttpListenerPort.ToString() + "/CAPS/" + capsPath + "0000/"; | 161 | serversInfo.HttpListenerPort.ToString() + "/CAPS/" + capsPath + "0000/"; |
162 | // response.SeedCapability = "http://" + reg.ExternalHostName + ":" + this.serversInfo.HttpListenerPort.ToString() + "/CapsSeed/" + capsPath + "0000/"; | 162 | |
163 | m_log.DebugFormat( | ||
164 | "[CAPS]: Sending new CAPS seed url {0} to client {1}", | ||
165 | response.SeedCapability, response.AgentID); | ||
166 | |||
163 | theUser.currentAgent.currentRegion = reg.RegionID; | 167 | theUser.currentAgent.currentRegion = reg.RegionID; |
164 | theUser.currentAgent.currentHandle = reg.RegionHandle; | 168 | theUser.currentAgent.currentHandle = reg.RegionHandle; |
165 | 169 | ||
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs index 6644299..364d3c7 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.cs | |||
@@ -1711,9 +1711,9 @@ namespace OpenSim.Region.Environment.Scenes | |||
1711 | public void AddCapsHandler(LLUUID agentId) | 1711 | public void AddCapsHandler(LLUUID agentId) |
1712 | { | 1712 | { |
1713 | String capsObjectPath = GetCapsPath(agentId); | 1713 | String capsObjectPath = GetCapsPath(agentId); |
1714 | 1714 | ||
1715 | m_log.DebugFormat( | 1715 | m_log.DebugFormat( |
1716 | "[CONNECTION DEBUGGING]: Setting up CAPS handler for avatar {0} in {1}", | 1716 | "[CAPS]: Setting up CAPS handler for root agent {0} in {1}", |
1717 | agentId, RegionInfo.RegionName); | 1717 | agentId, RegionInfo.RegionName); |
1718 | 1718 | ||
1719 | Caps cap = | 1719 | Caps cap = |
@@ -1739,7 +1739,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
1739 | if (m_capsHandlers.ContainsKey(agentId)) | 1739 | if (m_capsHandlers.ContainsKey(agentId)) |
1740 | { | 1740 | { |
1741 | m_log.DebugFormat( | 1741 | m_log.DebugFormat( |
1742 | "[CONNECTION DEBUGGING]: Removing CAPS handler for root agent {0} in {1}", | 1742 | "[CAPS]: Removing CAPS handler for root agent {0} in {1}", |
1743 | agentId, RegionInfo.RegionName); | 1743 | agentId, RegionInfo.RegionName); |
1744 | 1744 | ||
1745 | m_capsHandlers[agentId].DeregisterHandlers(); | 1745 | m_capsHandlers[agentId].DeregisterHandlers(); |
@@ -1748,7 +1748,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
1748 | else | 1748 | else |
1749 | { | 1749 | { |
1750 | m_log.WarnFormat( | 1750 | m_log.WarnFormat( |
1751 | "[CONNECTION DEBUGGING]: Received request to remove CAPS handler for root agent {0} in {1}, but no such CAPS handler found!", | 1751 | "[CAPS]: Received request to remove CAPS handler for root agent {0} in {1}, but no such CAPS handler found!", |
1752 | agentId, RegionInfo.RegionName); | 1752 | agentId, RegionInfo.RegionName); |
1753 | } | 1753 | } |
1754 | } | 1754 | } |
diff --git a/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs index c9abd97..7653bf4 100644 --- a/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs +++ b/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs | |||
@@ -568,7 +568,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
568 | + "/CAPS/" + circuitdata.CapsPath + "0000/"; | 568 | + "/CAPS/" + circuitdata.CapsPath + "0000/"; |
569 | 569 | ||
570 | m_log.DebugFormat( | 570 | m_log.DebugFormat( |
571 | "[CONNECTION DEBUGGING]: Sending new CAPS seed url {0} to avatar {1}", capsPath, avatar.UUID); | 571 | "[CAPS]: Sending new CAPS seed url {0} to client {1}", capsPath, avatar.UUID); |
572 | 572 | ||
573 | avatar.ControllingClient.SendRegionTeleport(regionHandle, 13, reg.ExternalEndPoint, 4, (1 << 4), | 573 | avatar.ControllingClient.SendRegionTeleport(regionHandle, 13, reg.ExternalEndPoint, 4, (1 << 4), |
574 | capsPath); | 574 | capsPath); |
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs index 8f9cbbf..774e3b4 100644 --- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs | |||
@@ -1637,7 +1637,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
1637 | + "/CAPS/" + circuitdata.CapsPath + "0000/"; | 1637 | + "/CAPS/" + circuitdata.CapsPath + "0000/"; |
1638 | 1638 | ||
1639 | m_log.DebugFormat( | 1639 | m_log.DebugFormat( |
1640 | "[CONNECTION DEBUGGING]: Sending new CAPS seed url {0} to avatar {1}", capsPath, m_uuid); | 1640 | "[CAPS]: Sending new CAPS seed url {0} to client {1}", capsPath, m_uuid); |
1641 | 1641 | ||
1642 | m_controllingClient.CrossRegion(neighbourHandle, newpos, vel, neighbourRegion.ExternalEndPoint, | 1642 | m_controllingClient.CrossRegion(neighbourHandle, newpos, vel, neighbourRegion.ExternalEndPoint, |
1643 | capsPath); | 1643 | capsPath); |