From c9c016e26a6d73a0bea1cbdc66fbc2595f58bf94 Mon Sep 17 00:00:00 2001 From: Adam Frisby Date: Wed, 14 May 2008 16:51:16 +0000 Subject: * Applying patches from Melanie to cover permissions module. Thanks! --- .../Modules/World/Permissions/PermissionsModule.cs | 9 +++++++++ OpenSim/Region/Environment/Scenes/ScenePresence.cs | 6 ++++++ bin/HttpServer.dll | Bin 0 -> 124928 bytes bin/OpenSim.ini.example | 2 ++ 4 files changed, 17 insertions(+) create mode 100644 bin/HttpServer.dll 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 modules=new List(permissionModules.Split(',')); + + if(!modules.Contains("DefaultPermissionsModule")) + return; + m_bypassPermissions = !myConfig.GetBoolean("serverside_object_permissions", true); m_scene.RegisterModuleInterface(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); } diff --git a/bin/HttpServer.dll b/bin/HttpServer.dll new file mode 100644 index 0000000..da1149c Binary files /dev/null and b/bin/HttpServer.dll differ diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example index 2725bd0..62c03f0 100644 --- a/bin/OpenSim.ini.example +++ b/bin/OpenSim.ini.example @@ -72,6 +72,8 @@ physics = basicphysics startup_console_commands_file = "startup_commands.txt" shutdown_console_commands_file = "shutdown_commands.txt" + +;permissionmodules = "DefaultPermissionsModule" serverside_object_permissions = false ; if you would like to allow prims to be physical and move by physics with the physical checkbox in the client set this to true. -- cgit v1.1