aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorDiva Canto2011-05-04 20:40:25 -0700
committerDiva Canto2011-05-04 20:40:25 -0700
commite8944d6c3163d25d7f6a8f278546b42db62b6b30 (patch)
treec150374724bb70f05b7710aacab5860c5afd2f97
parentMerge branch 'master' into caps (diff)
downloadopensim-SC_OLD-e8944d6c3163d25d7f6a8f278546b42db62b6b30.zip
opensim-SC_OLD-e8944d6c3163d25d7f6a8f278546b42db62b6b30.tar.gz
opensim-SC_OLD-e8944d6c3163d25d7f6a8f278546b42db62b6b30.tar.bz2
opensim-SC_OLD-e8944d6c3163d25d7f6a8f278546b42db62b6b30.tar.xz
Test m_Enabled on RemoveRegion.
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/ClientStack/Linden/Caps/GetMeshModule.cs3
-rw-r--r--OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs3
-rw-r--r--OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs3
3 files changed, 9 insertions, 0 deletions
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
87 87
88 public void RemoveRegion(Scene scene) 88 public void RemoveRegion(Scene scene)
89 { 89 {
90 if (!m_Enabled)
91 return;
92
90 m_scene.EventManager.OnRegisterCaps -= RegisterCaps; 93 m_scene.EventManager.OnRegisterCaps -= RegisterCaps;
91 m_scene = null; 94 m_scene = null;
92 } 95 }
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
90 90
91 public void RemoveRegion(Scene s) 91 public void RemoveRegion(Scene s)
92 { 92 {
93 if (!m_Enabled)
94 return;
95
93 m_scene.EventManager.OnRegisterCaps -= RegisterCaps; 96 m_scene.EventManager.OnRegisterCaps -= RegisterCaps;
94 m_scene = null; 97 m_scene = null;
95 } 98 }
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
79 79
80 public void RemoveRegion(Scene s) 80 public void RemoveRegion(Scene s)
81 { 81 {
82 if (!m_Enabled)
83 return;
84
82 m_scene.EventManager.OnRegisterCaps -= RegisterCaps; 85 m_scene.EventManager.OnRegisterCaps -= RegisterCaps;
83 m_scene = null; 86 m_scene = null;
84 } 87 }