If an agent is logging in, rather than teleporting, make sure all known

circuits for that agent are closed.

1 files changed, 8 insertions, 0 deletions

diff --git a/OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs b/OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs
index 8aceaa1..88447f3 100644
--- a/OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs
@@ -139,6 +139,14 @@ namespace OpenSim.Region.CoreModules.Framework
                 {
                     Caps oldCaps = m_capsObjects[circuitCode];
 
+                    // Remove tge handlers. They may conflict with the
+                    // new object created below
+                    oldCaps.DeregisterHandlers();
+
+                    // Better safe ... should not be needed but also 
+                    // no big deal
+                    m_capsObjects.Remove(circuitCode);
+
 //                    if (capsObjectPath == oldCaps.CapsObjectPath)
 //                    {
 //                        m_log.WarnFormat(