From 878ce1e6b2b96043052015732286141f5b71310b Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Thu, 25 Jul 2013 23:44:58 -0700
Subject: This should fix all issues with teleports. One should be able to TP
 as fast as needed. (Although sometimes Justin's state machine kicks in and
 doesn't let you) The EventQueues are a hairy mess, and it's very easy to mess
 things up. But it looks like this commit makes them work right. Here's what's
 going on: - Child and root agents are only closed after 15 sec, maybe - If
 the user comes back, they aren't closed, and everything is reused - On the
 receiving side, clients and scene presences are reused if they already exist
 - Caps are always recreated (this is where I spent most of my time!). It
 turns out that, because the agents carry the seeds around, the seed gets the
 same URL, except for the root agent coming back to a far away region, which
 gets a new seed (because we don't know what was its seed in the departing
 region, and we can't send it back to the client when the agent returns
 there).

---
 .../Region/CoreModules/Framework/Caps/CapabilitiesModule.cs   | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

(limited to 'OpenSim/Region/CoreModules/Framework/Caps')

diff --git a/OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs b/OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs
index ad1c4ce..6545a99 100644
--- a/OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs
@@ -132,13 +132,9 @@ namespace OpenSim.Region.CoreModules.Framework
                 {
                     Caps oldCaps = m_capsObjects[agentId];
                     
-                    m_log.DebugFormat(
-                        "[CAPS]: Recreating caps for agent {0}.  Old caps path {1}, new caps path {2}. ", 
-                        agentId, oldCaps.CapsObjectPath, capsObjectPath);
-                    // This should not happen. The caller code is confused. We need to fix that.
-                    // CAPs can never be reregistered, or the client will be confused.
-                    // Hence this return here.
-                    //return;
+                    //m_log.WarnFormat(
+                    //    "[CAPS]: Recreating caps for agent {0} in region {1}.  Old caps path {2}, new caps path {3}. ", 
+                    //    agentId, m_scene.RegionInfo.RegionName, oldCaps.CapsObjectPath, capsObjectPath);
                 }
 
                 caps = new Caps(MainServer.Instance, m_scene.RegionInfo.ExternalHostName,
@@ -153,6 +149,7 @@ namespace OpenSim.Region.CoreModules.Framework
 
         public void RemoveCaps(UUID agentId)
         {
+            m_log.DebugFormat("[CAPS]: Remove caps for agent {0} in region {1}", agentId, m_scene.RegionInfo.RegionName);
             lock (m_childrenSeeds)
             {
                 if (m_childrenSeeds.ContainsKey(agentId))
-- 
cgit v1.1