aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorDiva Canto2011-02-05 19:34:02 -0800
committerDiva Canto2011-02-05 19:34:02 -0800
commitcc81d924cab97889538c20e9bfa45008ecfead3e (patch)
tree642c0ee07bbc32b3c62ae376d4d14473d5fcd2a3
parentOne more diagnosis command: (diff)
downloadopensim-SC_OLD-cc81d924cab97889538c20e9bfa45008ecfead3e.zip
opensim-SC_OLD-cc81d924cab97889538c20e9bfa45008ecfead3e.tar.gz
opensim-SC_OLD-cc81d924cab97889538c20e9bfa45008ecfead3e.tar.bz2
opensim-SC_OLD-cc81d924cab97889538c20e9bfa45008ecfead3e.tar.xz
Fixed Caps handlers leak
-rw-r--r--OpenSim/Framework/Capabilities/CapsHandlers.cs2
-rw-r--r--OpenSim/Region/CoreModules/Agent/Capabilities/CapabilitiesModule.cs1
2 files changed, 1 insertions, 2 deletions
diff --git a/OpenSim/Framework/Capabilities/CapsHandlers.cs b/OpenSim/Framework/Capabilities/CapsHandlers.cs
index 864e6dd..e1c800e 100644
--- a/OpenSim/Framework/Capabilities/CapsHandlers.cs
+++ b/OpenSim/Framework/Capabilities/CapsHandlers.cs
@@ -88,8 +88,8 @@ namespace OpenSim.Framework.Capabilities
88 /// handler to be removed</param> 88 /// handler to be removed</param>
89 public void Remove(string capsName) 89 public void Remove(string capsName)
90 { 90 {
91 // This line must be here, or caps will break!
92 m_httpListener.RemoveStreamHandler("POST", m_capsHandlers[capsName].Path); 91 m_httpListener.RemoveStreamHandler("POST", m_capsHandlers[capsName].Path);
92 m_httpListener.RemoveStreamHandler("GET", m_capsHandlers[capsName].Path);
93 m_capsHandlers.Remove(capsName); 93 m_capsHandlers.Remove(capsName);
94 } 94 }
95 95
diff --git a/OpenSim/Region/CoreModules/Agent/Capabilities/CapabilitiesModule.cs b/OpenSim/Region/CoreModules/Agent/Capabilities/CapabilitiesModule.cs
index 75df6cc..1d8e70e 100644
--- a/OpenSim/Region/CoreModules/Agent/Capabilities/CapabilitiesModule.cs
+++ b/OpenSim/Region/CoreModules/Agent/Capabilities/CapabilitiesModule.cs
@@ -66,7 +66,6 @@ namespace OpenSim.Region.CoreModules.Agent.Capabilities
66 MainConsole.Instance.Commands.AddCommand("Capabilities", false, "show caps", 66 MainConsole.Instance.Commands.AddCommand("Capabilities", false, "show caps",
67 "show capabilities", 67 "show capabilities",
68 "Shows all registered capabilities", CapabilitiesCommand); 68 "Shows all registered capabilities", CapabilitiesCommand);
69 m_log.Error("\n\n**************************************************************\n\n");
70 } 69 }
71 70
72 public void RegionLoaded(Scene scene) 71 public void RegionLoaded(Scene scene)