4 files changed, 85 insertions, 49 deletions

diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index e036a3a..7948a6f 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -1649,53 +1649,11 @@ namespace OpenSim.Region.Environment.Scenes
         {
             if (regionHandle == m_regInfo.RegionHandle)
             {
-                if (agent.CapsPath != String.Empty)
-                {
-                    m_log.DebugFormat(
-                        "[CONNECTION DEBUGGING]: Setting up CAPS handler for avatar {0} at {1} in {2}",
-                        agent.AgentID, agent.CapsPath, RegionInfo.RegionName);
+                capsPaths[agent.AgentID] = agent.CapsPath;
                     
-                    Caps cap =
-                        new Caps(AssetCache, m_httpListener, m_regInfo.ExternalHostName, m_httpListener.Port,
-                                 agent.CapsPath, agent.AgentID, m_dumpAssetsToFile);
-
-                    Util.SetCapsURL(agent.AgentID,
-                                    "http://" + m_regInfo.ExternalHostName + ":" + m_httpListener.Port.ToString() +
-                                    "/CAPS/" + agent.CapsPath + "0000/");
-                    cap.RegisterHandlers();
-                    if (agent.child)
-                    {
-
-                    }
-                    cap.AddNewInventoryItem = AddInventoryItem;
-                    cap.ItemUpdatedCall = CapsUpdateInventoryItemAsset;
-                    cap.TaskScriptUpdatedCall = CapsUpdateTaskInventoryScriptAsset;
-                    cap.CAPSFetchInventoryDescendents = CommsManager.UserProfileCacheService.HandleFetchInventoryDescendentsCAPS;
-
-                    if (m_capsHandlers.ContainsKey(agent.AgentID))
-                    {
-                        m_log.DebugFormat(
-                            "[CONNECTION DEBUGGING]: Caps path already in use for avatar {0} in region {1}", 
-                            agent.AgentID, RegionInfo.RegionName);
-                        
-                        try
-                        {
-                            m_capsHandlers[agent.AgentID] = cap;
-                        }
-                        catch (KeyNotFoundException)
-                        {
-                            m_log.DebugFormat(
-                                "[CONNECTION DEBUGGING]: Caught exception adding handler for avatar {0} at {1}", 
-                                agent.AgentID, RegionInfo.RegionName);
-                            
-                            // Fix for a potential race condition.
-                            m_capsHandlers.Add(agent.AgentID, cap);
-                        }
-                    }
-                    else
-                    {
-                        m_capsHandlers.Add(agent.AgentID, cap);
-                    }
+                if (!agent.child)
+                {
+                    AddCapsHandler(agent.AgentID);
                 }
                 else
                 {
@@ -1716,6 +1674,56 @@ namespace OpenSim.Region.Environment.Scenes
                     "[CONNECTION DEBUGGING]: Skipping this region for welcoming avatar {0} [{1}] at {2}", 
                     agent.AgentID, regionHandle, RegionInfo.RegionName);
             }
+        }                
+
+        /// <summary>
+        /// Add a caps handler for the given agent.
+        /// </summary>
+        /// <param name="agentId"></param>   
+        /// <param name="capsObjectPath"></param>     
+        public void AddCapsHandler(LLUUID agentId)
+        {           
+            String capsObjectPath = GetCapsPath(agentId);            
+            
+            m_log.DebugFormat(
+                "[CONNECTION DEBUGGING]: Setting up CAPS handler for avatar {0} at {1} in {2}",
+                agentId, capsObjectPath, RegionInfo.RegionName);
+            
+            Caps cap =
+                new Caps(AssetCache, m_httpListener, m_regInfo.ExternalHostName, m_httpListener.Port,
+                         capsObjectPath, agentId, m_dumpAssetsToFile);
+
+            cap.RegisterHandlers();
+
+            cap.AddNewInventoryItem = AddInventoryItem;
+            cap.ItemUpdatedCall = CapsUpdateInventoryItemAsset;
+            cap.TaskScriptUpdatedCall = CapsUpdateTaskInventoryScriptAsset;
+            cap.CAPSFetchInventoryDescendents = CommsManager.UserProfileCacheService.HandleFetchInventoryDescendentsCAPS;
+
+            if (m_capsHandlers.ContainsKey(agentId))
+            {
+                m_log.DebugFormat(
+                    "[CONNECTION DEBUGGING]: Caps path already in use for avatar {0} in region {1}", 
+                    agentId, RegionInfo.RegionName);
+                
+                try
+                {
+                    m_capsHandlers[agentId] = cap;
+                }
+                catch (KeyNotFoundException)
+                {
+                    m_log.DebugFormat(
+                        "[CONNECTION DEBUGGING]: Caught exception adding handler for avatar {0} at {1}", 
+                        agentId, RegionInfo.RegionName);
+                    
+                    // Fix for a potential race condition.
+                    m_capsHandlers.Add(agentId, cap);
+                }
+            }
+            else
+            {
+                m_capsHandlers.Add(agentId, cap);
+            }
         }
 
         /// <summary>
diff --git a/OpenSim/Region/Environment/Scenes/SceneBase.cs b/OpenSim/Region/Environment/Scenes/SceneBase.cs
index 2cc5c4f..4002aaf 100644
--- a/OpenSim/Region/Environment/Scenes/SceneBase.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneBase.cs
@@ -26,6 +26,7 @@
  */
 
 using System;
+using System.Collections.Generic;
 using libsecondlife;
 using OpenSim.Framework;
 using OpenSim.Framework.Communications.Cache;
@@ -196,5 +197,19 @@ namespace OpenSim.Region.Environment.Scenes
         }
 
         #endregion
+        
+        /// <summary>
+        /// XXX These two methods are very temporary
+        /// </summary>
+        protected Dictionary<LLUUID, String> capsPaths = new Dictionary<LLUUID, String>();
+        public string GetCapsPath(LLUUID agentId)
+        {
+            if (capsPaths.ContainsKey(agentId))
+            {
+                return capsPaths[agentId];
+            }
+            
+            return null;
+        }
     }
 }
diff --git a/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
index e51c58d..d9c34e4 100644
--- a/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
@@ -483,7 +483,7 @@ namespace OpenSim.Region.Environment.Scenes
         }
 
         /// <summary>
-        /// 
+        /// Try to teleport an agent to a new region.
         /// </summary>
         /// <param name="remoteClient"></param>
         /// <param name="RegionHandle"></param>
@@ -530,7 +530,11 @@ namespace OpenSim.Region.Environment.Scenes
                         m_commsProvider.InterRegion.ExpectAvatarCrossing(regionHandle, avatar.ControllingClient.AgentId,
                                                                      position, false);
                         AgentCircuitData circuitdata = avatar.ControllingClient.RequestClientInfo();
-                        string capsPath = Util.GetCapsURL(avatar.ControllingClient.AgentId);
+                        
+                        // TODO Should construct this behind a method
+                        string capsPath = 
+                            "http://" + reg.ExternalHostName + ":" + 9000 + "/CAPS/" + circuitdata.CapsPath + "0000/";    
+                        
                         avatar.ControllingClient.SendRegionTeleport(regionHandle, 13, reg.ExternalEndPoint, 4, (1 << 4),
                                                                     capsPath);
                         avatar.MakeChildAgent();
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
index 050bf95..67a4b97 100644
--- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
@@ -545,6 +545,7 @@ namespace OpenSim.Region.Environment.Scenes
 
             m_scene.SwapRootAgentCount(false);
             m_scene.CommsManager.UserProfileCacheService.UpdateUserInventory(m_uuid);
+            m_scene.AddCapsHandler(m_uuid);
             //if (!m_gotAllObjectsInScene)
             //{
             m_scene.SendAllSceneObjectsToClient(this);
@@ -1616,7 +1617,15 @@ namespace OpenSim.Region.Environment.Scenes
                 if (res)
                 {
                     AgentCircuitData circuitdata = m_controllingClient.RequestClientInfo();
-                    string capsPath = Util.GetCapsURL(m_controllingClient.AgentId);
+
+                    // TODO Should construct this behind a method
+                    string capsPath = 
+                        "http://" + neighbourRegion.ExternalHostName + ":" + 9000
+                         + "/CAPS/" + circuitdata.CapsPath + "0000/";
+                    
+                    m_log.DebugFormat(
+                        "[CONNECTION DEBUGGING]: Sending new CAPS seed url {0} to avatar {1}", capsPath, m_uuid);
+                    
                     m_controllingClient.CrossRegion(neighbourHandle, newpos, vel, neighbourRegion.ExternalEndPoint,
                                                     capsPath);
                     MakeChildAgent();