From c7f3f3586db954ded2740e51331a312e2f7f7717 Mon Sep 17 00:00:00 2001
From: Kevin Cozens
Date: Wed, 16 May 2018 14:29:45 -0400
Subject: Warp3D tried to do something in RegionLoaded even when the module was
 disabled

---
 OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'OpenSim/Region/CoreModules/World/Warp3DMap')

diff --git a/OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs b/OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs
index 3e41c9f..ac1caae 100644
--- a/OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs
+++ b/OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs
@@ -136,6 +136,9 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
 
         public void RegionLoaded(Scene scene)
         {
+            if (!m_Enabled)
+                return;
+
             m_imgDecoder = m_scene.RequestModuleInterface<IJ2KDecoder>();
         }
 
-- 
cgit v1.1