aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim/Framework/Communications/Capabilities/Caps.cs7
1 files changed, 5 insertions, 2 deletions
diff --git a/OpenSim/Framework/Communications/Capabilities/Caps.cs b/OpenSim/Framework/Communications/Capabilities/Caps.cs
index c83c2a6..91acfbe 100644
--- a/OpenSim/Framework/Communications/Capabilities/Caps.cs
+++ b/OpenSim/Framework/Communications/Capabilities/Caps.cs
@@ -221,9 +221,12 @@ namespace OpenSim.Framework.Communications.Capabilities
221 /// <param name="restMethod"></param> 221 /// <param name="restMethod"></param>
222 public void DeregisterHandlers() 222 public void DeregisterHandlers()
223 { 223 {
224 foreach (string capsName in m_capsHandlers.Caps) 224 if (m_capsHandlers != null)
225 { 225 {
226 m_capsHandlers.Remove(capsName); 226 foreach (string capsName in m_capsHandlers.Caps)
227 {
228 m_capsHandlers.Remove(capsName);
229 }
227 } 230 }
228 } 231 }
229 232