diff options
| author | Tom Grimshaw | 2010-07-22 18:05:56 -0700 |
|---|---|---|
| committer | Tom Grimshaw | 2010-07-22 18:05:56 -0700 |
| commit | bfd883f5330d18def06d3bf7ca4ade00e2c1b4cd (patch) | |
| tree | eb6dda4df0ad33cc696625cd3814d453c17f843b | |
| parent | First, change DefaultPermissionsModule so it returns the correct name... (diff) | |
| download | opensim-SC-bfd883f5330d18def06d3bf7ca4ade00e2c1b4cd.zip opensim-SC-bfd883f5330d18def06d3bf7ca4ade00e2c1b4cd.tar.gz opensim-SC-bfd883f5330d18def06d3bf7ca4ade00e2c1b4cd.tar.bz2 opensim-SC-bfd883f5330d18def06d3bf7ca4ade00e2c1b4cd.tar.xz | |
... Then, make sure we also check the old-style module stack before we throw a tantrum
| -rw-r--r-- | OpenSim/Region/Application/OpenSimBase.cs | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs index b21793e..65dac66 100644 --- a/OpenSim/Region/Application/OpenSimBase.cs +++ b/OpenSim/Region/Application/OpenSimBase.cs | |||
| @@ -360,8 +360,19 @@ namespace OpenSim | |||
| 360 | { | 360 | { |
| 361 | if (!scene.RegionModules.ContainsKey(s)) | 361 | if (!scene.RegionModules.ContainsKey(s)) |
| 362 | { | 362 | { |
| 363 | m_log.Fatal("[MODULES]: Required module " + s + " not found."); | 363 | bool found = false; |
| 364 | Environment.Exit(0); | 364 | foreach (IRegionModule m in modules) |
| 365 | { | ||
| 366 | if (m.Name == s) | ||
| 367 | { | ||
| 368 | found = true; | ||
| 369 | } | ||
| 370 | } | ||
| 371 | if (!found) | ||
| 372 | { | ||
| 373 | m_log.Fatal("[MODULES]: Required module " + s + " not found."); | ||
| 374 | Environment.Exit(0); | ||
| 375 | } | ||
| 365 | } | 376 | } |
| 366 | } | 377 | } |
| 367 | } | 378 | } |