diff options
author | Melanie | 2011-02-07 22:26:09 +0100 |
---|---|---|
committer | Melanie | 2011-02-07 22:26:09 +0100 |
commit | 8c20f94939347d504c175ca7afb6b456188cdf2c (patch) | |
tree | c11023fbc6e701b44128d2b54bd024abd912a1b3 /OpenSim/Framework/Capabilities | |
parent | Prevent a nonexistent inventory item from throwing an exception (diff) | |
parent | Merge branch 'master' into careminster-presence-refactor (diff) | |
download | opensim-SC_OLD-8c20f94939347d504c175ca7afb6b456188cdf2c.zip opensim-SC_OLD-8c20f94939347d504c175ca7afb6b456188cdf2c.tar.gz opensim-SC_OLD-8c20f94939347d504c175ca7afb6b456188cdf2c.tar.bz2 opensim-SC_OLD-8c20f94939347d504c175ca7afb6b456188cdf2c.tar.xz |
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Framework/Capabilities/CapsHandlers.cs | 2 |
1 files changed, 1 insertions, 1 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 | ||