OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

0.6.0-stable
Adam Frisby 2008-05-14 16:51:16 +00:00
parent b1327dda01
commit c9c016e26a
4 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs
View File

@ -28,6 +28,8 @@
using libsecondlife; using libsecondlife;
using Nini.Config; using Nini.Config;
using System; using System;
using System.Collections;
using System.Collections.Generic;
using System.Reflection; using System.Reflection;
using log4net; using log4net;
using OpenSim.Region.Environment.Interfaces; using OpenSim.Region.Environment.Interfaces;
@ -143,6 +145,13 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions
IConfig myConfig = config.Configs["Startup"]; 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_bypassPermissions = !myConfig.GetBoolean("serverside_object_permissions", true);
m_scene.RegisterModuleInterface<IScenePermissions>(this); m_scene.RegisterModuleInterface<IScenePermissions>(this);

6
OpenSim/Region/Environment/Scenes/ScenePresence.cs
View File

@ -471,6 +471,12 @@ namespace OpenSim.Region.Environment.Scenes
public uint GenerateClientFlags(LLUUID ObjectID) 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); return m_scene.Permissions.GenerateClientFlags(m_uuid, ObjectID);
} }

BIN
bin/HttpServer.dll Normal file
View File

Binary file not shown.

2
bin/OpenSim.ini.example
View File

@ -72,6 +72,8 @@ physics = basicphysics
startup_console_commands_file = "startup_commands.txt" startup_console_commands_file = "startup_commands.txt"
shutdown_console_commands_file = "shutdown_commands.txt" shutdown_console_commands_file = "shutdown_commands.txt"
;permissionmodules = "DefaultPermissionsModule"
serverside_object_permissions = false 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. ; 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.