* Applying patches from Melanie to cover permissions module. Thanks!
parent
b1327dda01
commit
c9c016e26a
|
@ -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);
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
|
||||
|
|
Binary file not shown.
|
@ -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.
|
||||
|
|
Loading…
Reference in New Issue