diff options
| author | Kevin Cozens | 2018-05-16 14:29:45 -0400 |
|---|---|---|
| committer | Kevin Cozens | 2018-05-16 14:29:45 -0400 |
| commit | c7f3f3586db954ded2740e51331a312e2f7f7717 (patch) | |
| tree | a7599165176d1f663bc065f87d4dcaeda299314f /OpenSim/Region/CoreModules/World/Warp3DMap | |
| parent | Whitespace changes (diff) | |
| download | opensim-SC-c7f3f3586db954ded2740e51331a312e2f7f7717.zip opensim-SC-c7f3f3586db954ded2740e51331a312e2f7f7717.tar.gz opensim-SC-c7f3f3586db954ded2740e51331a312e2f7f7717.tar.bz2 opensim-SC-c7f3f3586db954ded2740e51331a312e2f7f7717.tar.xz | |
Warp3D tried to do something in RegionLoaded even when the module was disabled
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Warp3DMap')
| -rw-r--r-- | OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs | 3 |
1 files changed, 3 insertions, 0 deletions
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 | |||
| 136 | 136 | ||
| 137 | public void RegionLoaded(Scene scene) | 137 | public void RegionLoaded(Scene scene) |
| 138 | { | 138 | { |
| 139 | if (!m_Enabled) | ||
| 140 | return; | ||
| 141 | |||
| 139 | m_imgDecoder = m_scene.RequestModuleInterface<IJ2KDecoder>(); | 142 | m_imgDecoder = m_scene.RequestModuleInterface<IJ2KDecoder>(); |
| 140 | } | 143 | } |
| 141 | 144 | ||