aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes/Scene.cs
diff options
context:
space:
mode:
authorAdam Frisby2007-08-15 14:10:26 +0000
committerAdam Frisby2007-08-15 14:10:26 +0000
commit5699bb2e64766da634ca4be34bc2d8eab991f2e1 (patch)
treecf471be738a0ac69cf6a7a17b0a53183a7bfe68f /OpenSim/Region/Environment/Scenes/Scene.cs
parentPartial fix for the permissions on edited notecards/scripts (now you might st... (diff)
downloadopensim-SC_OLD-5699bb2e64766da634ca4be34bc2d8eab991f2e1.zip
opensim-SC_OLD-5699bb2e64766da634ca4be34bc2d8eab991f2e1.tar.gz
opensim-SC_OLD-5699bb2e64766da634ca4be34bc2d8eab991f2e1.tar.bz2
opensim-SC_OLD-5699bb2e64766da634ca4be34bc2d8eab991f2e1.tar.xz
* Permissions! - You can now only perform certain functions (such as editing other peoples objects) if you have permission to do so.
* Moved OnPermissionError to EventManager - now triggers a standard blue alert. * Terraforming now requires permission via the permissions manager. [Defaults to admin-only] * Permissions manager is now substantiated in Scene * Buttload of new permissions added. * Estate manager operations now require various levels of permission to operate * OGS1 now produces 'summary reports' for a commsManager of each scene it maintains connections for. Reduces grid network traffic for ping checks. * Added new "permissions true" / "permissions false" console command to enable or disable permissions.
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/Scene.cs')
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs16
1 files changed, 16 insertions, 0 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 6c87c5d..0fa3ab7 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -110,6 +110,13 @@ namespace OpenSim.Region.Environment.Scenes
110 get { return m_scriptManager; } 110 get { return m_scriptManager; }
111 } 111 }
112 112
113 private PermissionManager m_permissionManager;
114
115 public PermissionManager PermissionsMngr
116 {
117 get { return m_permissionManager; }
118 }
119
113 public Dictionary<LLUUID, SceneObjectGroup> Objects 120 public Dictionary<LLUUID, SceneObjectGroup> Objects
114 { 121 {
115 get { return Prims; } 122 get { return Prims; }
@@ -143,10 +150,13 @@ namespace OpenSim.Region.Environment.Scenes
143 m_estateManager = new EstateManager(this, m_regInfo); 150 m_estateManager = new EstateManager(this, m_regInfo);
144 m_scriptManager = new ScriptManager(this); 151 m_scriptManager = new ScriptManager(this);
145 m_eventManager = new EventManager(); 152 m_eventManager = new EventManager();
153 m_permissionManager = new PermissionManager(this);
146 154
147 m_eventManager.OnParcelPrimCountAdd += 155 m_eventManager.OnParcelPrimCountAdd +=
148 m_LandManager.addPrimToLandPrimCounts; 156 m_LandManager.addPrimToLandPrimCounts;
149 157
158 m_eventManager.OnPermissionError += SendPermissionAlert;
159
150 MainLog.Instance.Verbose("Creating new entitities instance"); 160 MainLog.Instance.Verbose("Creating new entitities instance");
151 Entities = new Dictionary<LLUUID, EntityBase>(); 161 Entities = new Dictionary<LLUUID, EntityBase>();
152 Avatars = new Dictionary<LLUUID, ScenePresence>(); 162 Avatars = new Dictionary<LLUUID, ScenePresence>();
@@ -966,6 +976,12 @@ namespace OpenSim.Region.Environment.Scenes
966 #endregion 976 #endregion
967 977
968 #region Alert Methods 978 #region Alert Methods
979
980 void SendPermissionAlert(LLUUID user, string reason)
981 {
982 SendAlertToUser(user, reason, false);
983 }
984
969 public void SendGeneralAlert(string message) 985 public void SendGeneralAlert(string message)
970 { 986 {
971 foreach (ScenePresence presence in this.Avatars.Values) 987 foreach (ScenePresence presence in this.Avatars.Values)