* Applying patches from Melanie to cover permissions module. Thanks!

2 files changed, 15 insertions, 0 deletions

diff --git a/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs b/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs
index 44f5c2d..8278a1d 100644
--- a/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs
+++ b/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs
@@ -28,6 +28,8 @@
 using libsecondlife;
 using Nini.Config;
 using System;
+using System.Collections;
+using System.Collections.Generic;
 using System.Reflection;
 using log4net;
 using OpenSim.Region.Environment.Interfaces;
@@ -143,6 +145,13 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions
             
             IConfig myConfig = config.Configs["Startup"];
             
+                        string permissionModules = myConfig.GetString("permissionmodules", "DefaultPermissionsModule");
+
+                        List<string> modules=new List<string>(permissionModules.Split(','));
+
+                        if(!modules.Contains("DefaultPermissionsModule"))
+                                return;
+
             m_bypassPermissions = !myConfig.GetBoolean("serverside_object_permissions", true);            
             
             m_scene.RegisterModuleInterface<IScenePermissions>(this);
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
index 2901a97..2829f7e 100644
--- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
@@ -471,6 +471,12 @@ namespace OpenSim.Region.Environment.Scenes
 
         public uint GenerateClientFlags(LLUUID ObjectID)
         {
+                        if(m_scene.Permissions == null)
+                        {
+                                SceneObjectPart task=m_scene.GetSceneObjectPart(ObjectID);
+
+                                return task.GetEffectiveObjectFlags() | (uint)2147483647;
+                        }
             return m_scene.Permissions.GenerateClientFlags(m_uuid, ObjectID);
         }