* Massaging CAPS setup/teardown log messages

* Leaving quite a few debug messages in for now to help deal with bugs arising

5 files changed, 15 insertions, 7 deletions

diff --git a/OpenSim/Grid/UserServer/UserLoginService.cs b/OpenSim/Grid/UserServer/UserLoginService.cs
index 20273ab..60408ff 100644
--- a/OpenSim/Grid/UserServer/UserLoginService.cs
+++ b/OpenSim/Grid/UserServer/UserLoginService.cs
@@ -146,6 +146,10 @@ namespace OpenSim.Grid.UserServer
                 //Not sure if the + "/CAPS/" should in fact be +"CAPS/" depending if there is already a / as part of httpServerURI
                 string capsPath = Util.GetRandomCapsPath();
                 response.SeedCapability = SimInfo.httpServerURI + "CAPS/" + capsPath + "0000/";
+                
+                m_log.DebugFormat(
+                    "[CAPS]: Sending new CAPS seed url {0} to client {1}", 
+                    response.SeedCapability, response.AgentID);                 
 
                 // Notify the target of an incoming user
                 //CFK: The "Notifying" message always seems to appear, so subsume the data from this message into 
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
 
                 response.SeedCapability = "http://" + reg.ExternalHostName + ":" +
                                           serversInfo.HttpListenerPort.ToString() + "/CAPS/" + capsPath + "0000/";
-                // response.SeedCapability = "http://" + reg.ExternalHostName + ":" + this.serversInfo.HttpListenerPort.ToString() + "/CapsSeed/" + capsPath + "0000/";
+                
+                m_log.DebugFormat(
+                    "[CAPS]: Sending new CAPS seed url {0} to client {1}", 
+                    response.SeedCapability, response.AgentID);                
+
                 theUser.currentAgent.currentRegion = reg.RegionID;
                 theUser.currentAgent.currentHandle = reg.RegionHandle;
 
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
         public void AddCapsHandler(LLUUID agentId)
         {                             
             String capsObjectPath = GetCapsPath(agentId);                
-                
+
             m_log.DebugFormat(
-                "[CONNECTION DEBUGGING]: Setting up CAPS handler for avatar {0} in {1}",
+                "[CAPS]: Setting up CAPS handler for root agent {0} in {1}",
                 agentId, RegionInfo.RegionName);
                 
             Caps cap =
@@ -1739,7 +1739,7 @@ namespace OpenSim.Region.Environment.Scenes
             if (m_capsHandlers.ContainsKey(agentId))
             {
                 m_log.DebugFormat(
-                    "[CONNECTION DEBUGGING]: Removing CAPS handler for root agent {0} in {1}", 
+                    "[CAPS]: Removing CAPS handler for root agent {0} in {1}", 
                     agentId, RegionInfo.RegionName);
                 
                 m_capsHandlers[agentId].DeregisterHandlers();
@@ -1748,7 +1748,7 @@ namespace OpenSim.Region.Environment.Scenes
             else
             {
                 m_log.WarnFormat(
-                    "[CONNECTION DEBUGGING]: Received request to remove CAPS handler for root agent {0} in {1}, but no such CAPS handler found!",
+                    "[CAPS]: Received request to remove CAPS handler for root agent {0} in {1}, but no such CAPS handler found!",
                     agentId, RegionInfo.RegionName);
             }
         }
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
                             + "/CAPS/" + circuitdata.CapsPath + "0000/";  
                         
                         m_log.DebugFormat(
-                            "[CONNECTION DEBUGGING]: Sending new CAPS seed url {0} to avatar {1}", capsPath, avatar.UUID);                        
+                            "[CAPS]: Sending new CAPS seed url {0} to client {1}", capsPath, avatar.UUID);                        
                         
                         avatar.ControllingClient.SendRegionTeleport(regionHandle, 13, reg.ExternalEndPoint, 4, (1 << 4),
                                                                     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
                          + "/CAPS/" + circuitdata.CapsPath + "0000/";
                     
                     m_log.DebugFormat(
-                        "[CONNECTION DEBUGGING]: Sending new CAPS seed url {0} to avatar {1}", capsPath, m_uuid);                                        
+                        "[CAPS]: Sending new CAPS seed url {0} to client {1}", capsPath, m_uuid);                                        
                     
                     m_controllingClient.CrossRegion(neighbourHandle, newpos, vel, neighbourRegion.ExternalEndPoint,
                                                     capsPath);