diff options
| author | Melanie | 2011-02-07 23:07:36 +0000 |
|---|---|---|
| committer | Melanie | 2011-02-07 23:07:36 +0000 |
| commit | 076f2ac8dbfa3dae31961ceadc41f4c0319f1fb0 (patch) | |
| tree | d6d80e7364bd96b95dddfbf03b708e2ea6ba3f77 /OpenSim/Region/OptionalModules | |
| parent | Fix merge issues (diff) | |
| parent | Hunting down mantis #5365 (diff) | |
| download | opensim-SC_OLD-076f2ac8dbfa3dae31961ceadc41f4c0319f1fb0.zip opensim-SC_OLD-076f2ac8dbfa3dae31961ceadc41f4c0319f1fb0.tar.gz opensim-SC_OLD-076f2ac8dbfa3dae31961ceadc41f4c0319f1fb0.tar.bz2 opensim-SC_OLD-076f2ac8dbfa3dae31961ceadc41f4c0319f1fb0.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/OptionalModules')
| -rw-r--r-- | OpenSim/Region/OptionalModules/World/WorldView/WorldViewModule.cs | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/OpenSim/Region/OptionalModules/World/WorldView/WorldViewModule.cs b/OpenSim/Region/OptionalModules/World/WorldView/WorldViewModule.cs index d4b7020..cee8851 100644 --- a/OpenSim/Region/OptionalModules/World/WorldView/WorldViewModule.cs +++ b/OpenSim/Region/OptionalModules/World/WorldView/WorldViewModule.cs | |||
| @@ -71,6 +71,9 @@ namespace OpenSim.Region.OptionalModules.World.WorldView | |||
| 71 | 71 | ||
| 72 | public void RegionLoaded(Scene scene) | 72 | public void RegionLoaded(Scene scene) |
| 73 | { | 73 | { |
| 74 | if (!m_Enabled) | ||
| 75 | return; | ||
| 76 | |||
| 74 | m_Generator = scene.RequestModuleInterface<IMapImageGenerator>(); | 77 | m_Generator = scene.RequestModuleInterface<IMapImageGenerator>(); |
| 75 | if (m_Generator == null) | 78 | if (m_Generator == null) |
| 76 | { | 79 | { |