aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/PermissionManager.cs
diff options
context:
space:
mode:
authorMW2007-11-18 11:11:44 +0000
committerMW2007-11-18 11:11:44 +0000
commit7f996448647e2703b82ea750bd38196fe5cea838 (patch)
tree2a44306e80f955d3381562b49d121413b53b8512 /OpenSim/Region/Environment/PermissionManager.cs
parentFor every problem there's a solution that is simple, neat and wrong. (diff)
downloadopensim-SC_OLD-7f996448647e2703b82ea750bd38196fe5cea838.zip
opensim-SC_OLD-7f996448647e2703b82ea750bd38196fe5cea838.tar.gz
opensim-SC_OLD-7f996448647e2703b82ea750bd38196fe5cea838.tar.bz2
opensim-SC_OLD-7f996448647e2703b82ea750bd38196fe5cea838.tar.xz
Attempt to get World Map working in Grid mode, will need to be using the grid asset server for it to work correctly and has only been quickly tested in a three region grid.
Moved PermissionManager creation out of the Scene constructor and instead a PermissionManager is passed to the constructor as a param. So that we could create and use custom permissionsManagers. Added AllowMovement property to ScenePresence which can be used to stop movement of avatars (for example in a custom region that wanted avatars always in one place). Added PermissionManager call when copying objects, although currently the call will always return true so that it allows copying in places like Wright Plaza. A few other changes/fixes.
Diffstat (limited to 'OpenSim/Region/Environment/PermissionManager.cs')
-rw-r--r--OpenSim/Region/Environment/PermissionManager.cs14
1 files changed, 14 insertions, 0 deletions
diff --git a/OpenSim/Region/Environment/PermissionManager.cs b/OpenSim/Region/Environment/PermissionManager.cs
index 560ecf3..412c6e7 100644
--- a/OpenSim/Region/Environment/PermissionManager.cs
+++ b/OpenSim/Region/Environment/PermissionManager.cs
@@ -48,12 +48,20 @@ namespace OpenSim.Region.Environment
48 set { m_bypassPermissions = value; } 48 set { m_bypassPermissions = value; }
49 } 49 }
50 50
51 public PermissionManager()
52 {
53 }
51 54
52 public PermissionManager(Scene scene) 55 public PermissionManager(Scene scene)
53 { 56 {
54 m_scene = scene; 57 m_scene = scene;
55 } 58 }
56 59
60 public void Initialise(Scene scene)
61 {
62 m_scene = scene;
63 }
64
57 protected virtual void SendPermissionError(LLUUID user, string reason) 65 protected virtual void SendPermissionError(LLUUID user, string reason)
58 { 66 {
59 m_scene.EventManager.TriggerPermissionError(user, reason); 67 m_scene.EventManager.TriggerPermissionError(user, reason);
@@ -188,6 +196,12 @@ namespace OpenSim.Region.Environment
188 return GenericObjectPermission(user, obj); 196 return GenericObjectPermission(user, obj);
189 } 197 }
190 198
199 public virtual bool CanCopyObject(LLUUID user, LLUUID obj)
200 {
201 return true;
202 // return GenericObjectPermission(user, obj);
203 }
204
191 #endregion 205 #endregion
192 206
193 #region Communication Permissions 207 #region Communication Permissions