aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules
diff options
context:
space:
mode:
authorMelanie Thielker2009-04-01 01:41:40 +0000
committerMelanie Thielker2009-04-01 01:41:40 +0000
commit7ec85508ff28c34bc0b04617cf53ed94748956bd (patch)
tree65cb2cd7b1dd3ceaff36bbeb9e41706793c18ca2 /OpenSim/Region/CoreModules
parentAdded AllowLoginWithoutInventory to LoginService, to be overwritten in subcla... (diff)
downloadopensim-SC-7ec85508ff28c34bc0b04617cf53ed94748956bd.zip
opensim-SC-7ec85508ff28c34bc0b04617cf53ed94748956bd.tar.gz
opensim-SC-7ec85508ff28c34bc0b04617cf53ed94748956bd.tar.bz2
opensim-SC-7ec85508ff28c34bc0b04617cf53ed94748956bd.tar.xz
Finally clean up the Scene.Permissions and permissions module.
Permissions now use proper events and not delegate lists, which makes for much easier reading and much less work adding new methods. I finally found a way to raise events with return values without it becoming late bound.
Diffstat (limited to 'OpenSim/Region/CoreModules')
-rw-r--r--OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs84
1 files changed, 42 insertions, 42 deletions
diff --git a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
index 7b4a571..25bfd7d 100644
--- a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
+++ b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
@@ -122,51 +122,51 @@ namespace OpenSim.Region.CoreModules.World.Permissions
122 m_log.Debug("[PERMISSIONS]: Enabling all region service permission checks"); 122 m_log.Debug("[PERMISSIONS]: Enabling all region service permission checks");
123 123
124 //Register functions with Scene External Checks! 124 //Register functions with Scene External Checks!
125 m_scene.Permissions.AddBypassPermissionsHandler(BypassPermissions); //FULLY IMPLEMENTED 125 m_scene.Permissions.OnBypassPermissions += BypassPermissions;
126 m_scene.Permissions.AddSetBypassPermissionsHandler(SetBypassPermissions); //FULLY IMPLEMENTED 126 m_scene.Permissions.OnSetBypassPermissions += SetBypassPermissions;
127 m_scene.Permissions.AddPropagatePermissionsHandler(PropagatePermissions); //FULLY IMPLEMENTED 127 m_scene.Permissions.OnPropagatePermissions += PropagatePermissions;
128 m_scene.Permissions.AddGenerateClientFlagsHandler(GenerateClientFlags); //NOT YET FULLY IMPLEMENTED 128 m_scene.Permissions.OnGenerateClientFlags += GenerateClientFlags;
129 m_scene.Permissions.AddAbandonParcelHandler(CanAbandonParcel); //FULLY IMPLEMENTED 129 m_scene.Permissions.OnAbandonParcel += CanAbandonParcel;
130 m_scene.Permissions.AddReclaimParcelHandler(CanReclaimParcel); //FULLY IMPLEMENTED 130 m_scene.Permissions.OnReclaimParcel += CanReclaimParcel;
131 m_scene.Permissions.AddIsGodHandler(IsGod); //FULLY IMPLEMENTED 131 m_scene.Permissions.OnIsGod += IsGod;
132 m_scene.Permissions.AddDuplicateObjectHandler(CanDuplicateObject); //FULLY IMPLEMENTED 132 m_scene.Permissions.OnDuplicateObject += CanDuplicateObject;
133 m_scene.Permissions.AddDeleteObjectHandler(CanDeleteObject); //MAYBE FULLY IMPLEMENTED 133 m_scene.Permissions.OnDeleteObject += CanDeleteObject; //MAYBE FULLY IMPLEMENTED
134 m_scene.Permissions.AddEditObjectHandler(CanEditObject);//MAYBE FULLY IMPLEMENTED 134 m_scene.Permissions.OnEditObject += CanEditObject; //MAYBE FULLY IMPLEMENTED
135 m_scene.Permissions.AddEditParcelHandler(CanEditParcel); //FULLY IMPLEMENTED 135 m_scene.Permissions.OnEditParcel += CanEditParcel; //MAYBE FULLY IMPLEMENTED
136 m_scene.Permissions.AddInstantMessageHandler(CanInstantMessage); //FULLY IMPLEMENTED 136 m_scene.Permissions.OnInstantMessage += CanInstantMessage;
137 m_scene.Permissions.AddInventoryTransferHandler(CanInventoryTransfer); //NOT YET IMPLEMENTED 137 m_scene.Permissions.OnInventoryTransfer += CanInventoryTransfer; //NOT YET IMPLEMENTED
138 m_scene.Permissions.AddIssueEstateCommandHandler(CanIssueEstateCommand); //FULLY IMPLEMENTED 138 m_scene.Permissions.OnIssueEstateCommand += CanIssueEstateCommand; //FULLY IMPLEMENTED
139 m_scene.Permissions.AddMoveObjectHandler(CanMoveObject); //HOPEFULLY FULLY IMPLEMENTED 139 m_scene.Permissions.OnMoveObject += CanMoveObject; //MAYBE FULLY IMPLEMENTED
140 m_scene.Permissions.AddObjectEntryHandler(CanObjectEntry); //FULLY IMPLEMENTED 140 m_scene.Permissions.OnObjectEntry += CanObjectEntry;
141 m_scene.Permissions.AddReturnObjectHandler(CanReturnObject); //NOT YET IMPLEMENTED 141 m_scene.Permissions.OnReturnObject += CanReturnObject; //NOT YET IMPLEMENTED
142 m_scene.Permissions.AddRezObjectHandler(CanRezObject); //HOPEFULLY FULLY IMPLEMENTED 142 m_scene.Permissions.OnRezObject += CanRezObject; //MAYBE FULLY IMPLEMENTED
143 m_scene.Permissions.AddRunConsoleCommandHandler(CanRunConsoleCommand); //FULLY IMPLEMENTED 143 m_scene.Permissions.OnRunConsoleCommand += CanRunConsoleCommand;
144 m_scene.Permissions.AddRunScriptHandler(CanRunScript); //NOT YET IMPLEMENTED 144 m_scene.Permissions.OnRunScript += CanRunScript; //NOT YET IMPLEMENTED
145 m_scene.Permissions.AddSellParcelHandler(CanSellParcel); //FULLY IMPLEMENTED 145 m_scene.Permissions.OnSellParcel += CanSellParcel;
146 m_scene.Permissions.AddTakeObjectHandler(CanTakeObject); //FULLY IMPLEMENTED 146 m_scene.Permissions.OnTakeObject += CanTakeObject;
147 m_scene.Permissions.AddTakeCopyObjectHandler(CanTakeCopyObject); //FULLY IMPLEMENTED 147 m_scene.Permissions.OnTakeCopyObject += CanTakeCopyObject;
148 m_scene.Permissions.AddTerraformLandHandler(CanTerraformLand); //FULL IMPLEMENTED (POINT ONLY!!! NOT AREA!!!) 148 m_scene.Permissions.OnTerraformLand += CanTerraformLand;
149 m_scene.Permissions.AddCanLinkObjectHandler(CanLinkObject); //NOT YET IMPLEMENTED 149 m_scene.Permissions.OnLinkObject += CanLinkObject; //NOT YET IMPLEMENTED
150 m_scene.Permissions.AddCanDelinkObjectHandler(CanDelinkObject); //NOT YET IMPLEMENTED 150 m_scene.Permissions.OnDelinkObject += CanDelinkObject; //NOT YET IMPLEMENTED
151 m_scene.Permissions.AddCanBuyLandHandler(CanBuyLand); //NOT YET IMPLEMENTED 151 m_scene.Permissions.OnBuyLand += CanBuyLand; //NOT YET IMPLEMENTED
152 152
153 m_scene.Permissions.AddViewNotecardHandler(CanViewNotecard); //NOT YET IMPLEMENTED 153 m_scene.Permissions.OnViewNotecard += CanViewNotecard; //NOT YET IMPLEMENTED
154 m_scene.Permissions.AddViewScriptHandler(CanViewScript); //NOT YET IMPLEMENTED 154 m_scene.Permissions.OnViewScript += CanViewScript; //NOT YET IMPLEMENTED
155 m_scene.Permissions.AddEditNotecardHandler(CanEditNotecard); //NOT YET IMPLEMENTED 155 m_scene.Permissions.OnEditNotecard += CanEditNotecard; //NOT YET IMPLEMENTED
156 m_scene.Permissions.AddEditScriptHandler(CanEditScript); //NOT YET IMPLEMENTED 156 m_scene.Permissions.OnEditScript += CanEditScript; //NOT YET IMPLEMENTED
157 157
158 m_scene.Permissions.AddCanCreateObjectInventoryHandler(CanCreateObjectInventory); //NOT IMPLEMENTED HERE 158 m_scene.Permissions.OnCreateObjectInventory += CanCreateObjectInventory; //NOT IMPLEMENTED HERE
159 m_scene.Permissions.AddEditObjectInventoryHandler(CanEditObjectInventory);//MAYBE FULLY IMPLEMENTED 159 m_scene.Permissions.OnEditObjectInventory += CanEditObjectInventory;//MAYBE FULLY IMPLEMENTED
160 m_scene.Permissions.AddCanCopyObjectInventoryHandler(CanCopyObjectInventory); //NOT YET IMPLEMENTED 160 m_scene.Permissions.OnCopyObjectInventory += CanCopyObjectInventory; //NOT YET IMPLEMENTED
161 m_scene.Permissions.AddCanDeleteObjectInventoryHandler(CanDeleteObjectInventory); //NOT YET IMPLEMENTED 161 m_scene.Permissions.OnDeleteObjectInventory += CanDeleteObjectInventory; //NOT YET IMPLEMENTED
162 m_scene.Permissions.AddResetScriptHandler(CanResetScript); 162 m_scene.Permissions.OnResetScript += CanResetScript;
163 163
164 m_scene.Permissions.AddCanCreateUserInventoryHandler(CanCreateUserInventory); //NOT YET IMPLEMENTED 164 m_scene.Permissions.OnCreateUserInventory += CanCreateUserInventory; //NOT YET IMPLEMENTED
165 m_scene.Permissions.AddCanCopyUserInventoryHandler(CanCopyUserInventory); //NOT YET IMPLEMENTED 165 m_scene.Permissions.OnCopyUserInventory += CanCopyUserInventory; //NOT YET IMPLEMENTED
166 m_scene.Permissions.AddCanEditUserInventoryHandler(CanEditUserInventory); //NOT YET IMPLEMENTED 166 m_scene.Permissions.OnEditUserInventory += CanEditUserInventory; //NOT YET IMPLEMENTED
167 m_scene.Permissions.AddCanDeleteUserInventoryHandler(CanDeleteUserInventory); //NOT YET IMPLEMENTED 167 m_scene.Permissions.OnDeleteUserInventory += CanDeleteUserInventory; //NOT YET IMPLEMENTED
168 168
169 m_scene.Permissions.AddCanTeleportHandler(CanTeleport); //NOT YET IMPLEMENTED 169 m_scene.Permissions.OnTeleport += CanTeleport; //NOT YET IMPLEMENTED
170 170
171 m_scene.AddCommand(this, "bypass permissions", 171 m_scene.AddCommand(this, "bypass permissions",
172 "bypass permissions <true / false>", 172 "bypass permissions <true / false>",
@@ -1469,7 +1469,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
1469 return true; 1469 return true;
1470 } 1470 }
1471 1471
1472 private bool CanTeleport(UUID userID) 1472 private bool CanTeleport(UUID userID, Scene scene)
1473 { 1473 {
1474 DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name); 1474 DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name);
1475 if (m_bypassPermissions) return m_bypassPermissionsValue; 1475 if (m_bypassPermissions) return m_bypassPermissionsValue;
generated by cgit v1.1 at 2024-12-17 01:01:03 +0000