aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorAdam Frisby2008-05-14 16:51:16 +0000
committerAdam Frisby2008-05-14 16:51:16 +0000
commitc9c016e26a6d73a0bea1cbdc66fbc2595f58bf94 (patch)
tree861da7c88027fcd1264fbed23316845f10e0f985 /OpenSim/Region
parentfix for a change in inventory that meant I was returning a lot (diff)
downloadopensim-SC-c9c016e26a6d73a0bea1cbdc66fbc2595f58bf94.zip
opensim-SC-c9c016e26a6d73a0bea1cbdc66fbc2595f58bf94.tar.gz
opensim-SC-c9c016e26a6d73a0bea1cbdc66fbc2595f58bf94.tar.bz2
opensim-SC-c9c016e26a6d73a0bea1cbdc66fbc2595f58bf94.tar.xz
* Applying patches from Melanie to cover permissions module. Thanks!
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs9
-rw-r--r--OpenSim/Region/Environment/Scenes/ScenePresence.cs6
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 @@
28using libsecondlife; 28using libsecondlife;
29using Nini.Config; 29using Nini.Config;
30using System; 30using System;
31using System.Collections;
32using System.Collections.Generic;
31using System.Reflection; 33using System.Reflection;
32using log4net; 34using log4net;
33using OpenSim.Region.Environment.Interfaces; 35using OpenSim.Region.Environment.Interfaces;
@@ -143,6 +145,13 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions
143 145
144 IConfig myConfig = config.Configs["Startup"]; 146 IConfig myConfig = config.Configs["Startup"];
145 147
148 string permissionModules = myConfig.GetString("permissionmodules", "DefaultPermissionsModule");
149
150 List<string> modules=new List<string>(permissionModules.Split(','));
151
152 if(!modules.Contains("DefaultPermissionsModule"))
153 return;
154
146 m_bypassPermissions = !myConfig.GetBoolean("serverside_object_permissions", true); 155 m_bypassPermissions = !myConfig.GetBoolean("serverside_object_permissions", true);
147 156
148 m_scene.RegisterModuleInterface<IScenePermissions>(this); 157 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
471 471
472 public uint GenerateClientFlags(LLUUID ObjectID) 472 public uint GenerateClientFlags(LLUUID ObjectID)
473 { 473 {
474 if(m_scene.Permissions == null)
475 {
476 SceneObjectPart task=m_scene.GetSceneObjectPart(ObjectID);
477
478 return task.GetEffectiveObjectFlags() | (uint)2147483647;
479 }
474 return m_scene.Permissions.GenerateClientFlags(m_uuid, ObjectID); 480 return m_scene.Permissions.GenerateClientFlags(m_uuid, ObjectID);
475 } 481 }
476 482