From e8944d6c3163d25d7f6a8f278546b42db62b6b30 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Wed, 4 May 2011 20:40:25 -0700
Subject: Test m_Enabled on RemoveRegion.

---
 OpenSim/Region/ClientStack/Linden/Caps/GetMeshModule.cs         | 3 +++
 OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs      | 3 +++
 OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs | 3 +++
 3 files changed, 9 insertions(+)

(limited to 'OpenSim')

diff --git a/OpenSim/Region/ClientStack/Linden/Caps/GetMeshModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/GetMeshModule.cs
index f2f765c..e0807ee 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/GetMeshModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/GetMeshModule.cs
@@ -87,6 +87,9 @@ namespace OpenSim.Region.ClientStack.Linden
 
         public void RemoveRegion(Scene scene)
         {
+            if (!m_Enabled)
+                return;
+
             m_scene.EventManager.OnRegisterCaps -= RegisterCaps;
             m_scene = null;
         }
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs
index 564ef31..35eedb4 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs
@@ -90,6 +90,9 @@ namespace OpenSim.Region.ClientStack.Linden
 
         public void RemoveRegion(Scene s)
         {
+            if (!m_Enabled)
+                return;
+
             m_scene.EventManager.OnRegisterCaps -= RegisterCaps;
             m_scene = null;
         }
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs
index 55f220d..94629a2 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs
@@ -79,6 +79,9 @@ namespace OpenSim.Region.ClientStack.Linden
 
         public void RemoveRegion(Scene s)
         {
+            if (!m_Enabled)
+                return;
+
             m_scene.EventManager.OnRegisterCaps -= RegisterCaps;
             m_scene = null;
         }
-- 
cgit v1.1