From b860c8021e2fcc2522c931d7e503299079924743 Mon Sep 17 00:00:00 2001
From: Tom
Date: Sun, 1 Aug 2010 10:23:48 -0700
Subject: First, change DefaultPermissionsModule so it returns the correct
 name... ... Then, make sure we also check the old-style module stack before
 we throw a tantrum

---
 OpenSim/Region/Application/OpenSimBase.cs                 | 15 +++++++++++++--
 .../CoreModules/World/Permissions/PermissionsModule.cs    |  2 +-
 2 files changed, 14 insertions(+), 3 deletions(-)

(limited to 'OpenSim')

diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs
index 9267721..fc67f94 100644
--- a/OpenSim/Region/Application/OpenSimBase.cs
+++ b/OpenSim/Region/Application/OpenSimBase.cs
@@ -357,8 +357,19 @@ namespace OpenSim
                 {
                     if (!scene.RegionModules.ContainsKey(s))
                     {
-                        m_log.Fatal("[MODULES]: Required module " + s + " not found.");
-                        Environment.Exit(0);
+                        bool found = false;
+                        foreach (IRegionModule m in modules)
+                        {
+                            if (m.Name == s)
+                            {
+                                found = true;
+                            }
+                        }
+                        if (!found)
+                        {
+                            m_log.Fatal("[MODULES]: Required module " + s + " not found.");
+                            Environment.Exit(0);
+                        }
                     }
                 }
             }
diff --git a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
index 1d70546..8223f12 100644
--- a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
+++ b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
@@ -402,7 +402,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
 
         public string Name
         {
-            get { return "PermissionsModule"; }
+            get { return "DefaultPermissionsModule"; }
         }
 
         public bool IsSharedModule
-- 
cgit v1.1