aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs16
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.Inventory.cs2
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneExternalChecks.cs88
3 files changed, 53 insertions, 53 deletions
diff --git a/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs b/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs
index 8ecea9e..87348fc 100644
--- a/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs
+++ b/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs
@@ -186,10 +186,10 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions
186 m_scene.ExternalChecks.addCheckCanBuyLand(CanBuyLand); //NOT YET IMPLEMENTED 186 m_scene.ExternalChecks.addCheckCanBuyLand(CanBuyLand); //NOT YET IMPLEMENTED
187 m_scene.ExternalChecks.addCheckCanCopyObjectInventory(CanCopyObjectInventory); //NOT YET IMPLEMENTED 187 m_scene.ExternalChecks.addCheckCanCopyObjectInventory(CanCopyObjectInventory); //NOT YET IMPLEMENTED
188 m_scene.ExternalChecks.addCheckCanDeleteObjectInventory(CanDeleteObjectInventory); //NOT YET IMPLEMENTED 188 m_scene.ExternalChecks.addCheckCanDeleteObjectInventory(CanDeleteObjectInventory); //NOT YET IMPLEMENTED
189 m_scene.ExternalChecks.addCheckCanCreateAvatarInventory(CanCreateAvatarInventory); //NOT YET IMPLEMENTED 189 m_scene.ExternalChecks.addCheckCanCreateUserInventory(CanCreateUserInventory); //NOT YET IMPLEMENTED
190 m_scene.ExternalChecks.addCheckCanCopyAvatarInventory(CanCopyAvatarInventory); //NOT YET IMPLEMENTED 190 m_scene.ExternalChecks.addCheckCanCopyUserInventory(CanCopyUserInventory); //NOT YET IMPLEMENTED
191 m_scene.ExternalChecks.addCheckCanEditAvatarInventory(CanEditAvatarInventory); //NOT YET IMPLEMENTED 191 m_scene.ExternalChecks.addCheckCanEditUserInventory(CanEditUserInventory); //NOT YET IMPLEMENTED
192 m_scene.ExternalChecks.addCheckCanDeleteAvatarInventory(CanDeleteAvatarInventory); //NOT YET IMPLEMENTED 192 m_scene.ExternalChecks.addCheckCanDeleteUserInventory(CanDeleteUserInventory); //NOT YET IMPLEMENTED
193 m_scene.ExternalChecks.addCheckCanTeleport(CanTeleport); //NOT YET IMPLEMENTED 193 m_scene.ExternalChecks.addCheckCanTeleport(CanTeleport); //NOT YET IMPLEMENTED
194 194
195 //Register Debug Commands 195 //Register Debug Commands
@@ -1244,7 +1244,7 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions
1244 /// <param name="invType"></param> 1244 /// <param name="invType"></param>
1245 /// <param name="userID"></param> 1245 /// <param name="userID"></param>
1246 /// <returns></returns> 1246 /// <returns></returns>
1247 public bool CanCreateAvatarInventory(int invType, UUID userID) 1247 public bool CanCreateUserInventory(int invType, UUID userID)
1248 { 1248 {
1249 //m_log.Debug("[PERMISSIONS]: CanCreateAvatarInventory called"); 1249 //m_log.Debug("[PERMISSIONS]: CanCreateAvatarInventory called");
1250 1250
@@ -1260,7 +1260,7 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions
1260 /// <param name="itemID"></param> 1260 /// <param name="itemID"></param>
1261 /// <param name="userID"></param> 1261 /// <param name="userID"></param>
1262 /// <returns></returns> 1262 /// <returns></returns>
1263 public bool CanCopyAvatarInventory(UUID itemID, UUID userID) 1263 public bool CanCopyUserInventory(UUID itemID, UUID userID)
1264 { 1264 {
1265 DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name); 1265 DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name);
1266 if (m_bypassPermissions) return m_bypassPermissionsValue; 1266 if (m_bypassPermissions) return m_bypassPermissionsValue;
@@ -1274,7 +1274,7 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions
1274 /// <param name="itemID"></param> 1274 /// <param name="itemID"></param>
1275 /// <param name="userID"></param> 1275 /// <param name="userID"></param>
1276 /// <returns></returns> 1276 /// <returns></returns>
1277 public bool CanEditAvatarInventory(UUID itemID, UUID userID) 1277 public bool CanEditUserInventory(UUID itemID, UUID userID)
1278 { 1278 {
1279 DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name); 1279 DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name);
1280 if (m_bypassPermissions) return m_bypassPermissionsValue; 1280 if (m_bypassPermissions) return m_bypassPermissionsValue;
@@ -1288,7 +1288,7 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions
1288 /// <param name="itemID"></param> 1288 /// <param name="itemID"></param>
1289 /// <param name="userID"></param> 1289 /// <param name="userID"></param>
1290 /// <returns></returns> 1290 /// <returns></returns>
1291 public bool CanDeleteAvatarInventory(UUID itemID, UUID userID) 1291 public bool CanDeleteUserInventory(UUID itemID, UUID userID)
1292 { 1292 {
1293 DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name); 1293 DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name);
1294 if (m_bypassPermissions) return m_bypassPermissionsValue; 1294 if (m_bypassPermissions) return m_bypassPermissionsValue;
diff --git a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
index e548f36..12095e5 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
@@ -761,7 +761,7 @@ namespace OpenSim.Region.Environment.Scenes
761 { 761 {
762 m_log.DebugFormat("[AGENT INVENTORY]: Received request to create inventory item {0} in folder {1}", name, folderID); 762 m_log.DebugFormat("[AGENT INVENTORY]: Received request to create inventory item {0} in folder {1}", name, folderID);
763 763
764 if (!ExternalChecks.ExternalChecksCanCreateAvatarInventory(invType, remoteClient.AgentId)) 764 if (!ExternalChecks.ExternalChecksCanCreateUserInventory(invType, remoteClient.AgentId))
765 return; 765 return;
766 766
767 if (transactionID == UUID.Zero) 767 if (transactionID == UUID.Zero)
diff --git a/OpenSim/Region/Environment/Scenes/SceneExternalChecks.cs b/OpenSim/Region/Environment/Scenes/SceneExternalChecks.cs
index cc627b0..0977734 100644
--- a/OpenSim/Region/Environment/Scenes/SceneExternalChecks.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneExternalChecks.cs
@@ -1164,20 +1164,20 @@ namespace OpenSim.Region.Environment.Scenes
1164 return true; 1164 return true;
1165 } 1165 }
1166 1166
1167 public delegate bool CanCreateAvatarInventory(int invType, UUID userID); 1167 public delegate bool CanCreateUserInventory(int invType, UUID userID);
1168 private List<CanCreateAvatarInventory> CanCreateAvatarInventoryCheckFunctions 1168 private List<CanCreateUserInventory> CanCreateUserInventoryCheckFunctions
1169 = new List<CanCreateAvatarInventory>(); 1169 = new List<CanCreateUserInventory>();
1170 1170
1171 public void addCheckCanCreateAvatarInventory(CanCreateAvatarInventory delegateFunc) 1171 public void addCheckCanCreateUserInventory(CanCreateUserInventory delegateFunc)
1172 { 1172 {
1173 if (!CanCreateAvatarInventoryCheckFunctions.Contains(delegateFunc)) 1173 if (!CanCreateUserInventoryCheckFunctions.Contains(delegateFunc))
1174 CanCreateAvatarInventoryCheckFunctions.Add(delegateFunc); 1174 CanCreateUserInventoryCheckFunctions.Add(delegateFunc);
1175 } 1175 }
1176 1176
1177 public void removeCheckCanCreateAvatarInventory(CanCreateAvatarInventory delegateFunc) 1177 public void removeCheckCanCreateUserInventory(CanCreateUserInventory delegateFunc)
1178 { 1178 {
1179 if (CanCreateAvatarInventoryCheckFunctions.Contains(delegateFunc)) 1179 if (CanCreateUserInventoryCheckFunctions.Contains(delegateFunc))
1180 CanCreateAvatarInventoryCheckFunctions.Remove(delegateFunc); 1180 CanCreateUserInventoryCheckFunctions.Remove(delegateFunc);
1181 } 1181 }
1182 1182
1183 /// <summary> 1183 /// <summary>
@@ -1186,9 +1186,9 @@ namespace OpenSim.Region.Environment.Scenes
1186 /// <param name="invType"></param> 1186 /// <param name="invType"></param>
1187 /// <param name="userID"></param> 1187 /// <param name="userID"></param>
1188 /// <returns></returns> 1188 /// <returns></returns>
1189 public bool ExternalChecksCanCreateAvatarInventory(int invType, UUID userID) 1189 public bool ExternalChecksCanCreateUserInventory(int invType, UUID userID)
1190 { 1190 {
1191 foreach (CanCreateAvatarInventory check in CanCreateAvatarInventoryCheckFunctions) 1191 foreach (CanCreateUserInventory check in CanCreateUserInventoryCheckFunctions)
1192 { 1192 {
1193 if (check(invType, userID) == false) 1193 if (check(invType, userID) == false)
1194 { 1194 {
@@ -1199,20 +1199,20 @@ namespace OpenSim.Region.Environment.Scenes
1199 return true; 1199 return true;
1200 } 1200 }
1201 1201
1202 public delegate bool CanEditAvatarInventory(UUID itemID, UUID userID); 1202 public delegate bool CanEditUserInventory(UUID itemID, UUID userID);
1203 private List<CanEditAvatarInventory> CanEditAvatarInventoryCheckFunctions 1203 private List<CanEditUserInventory> CanEditUserInventoryCheckFunctions
1204 = new List<CanEditAvatarInventory>(); 1204 = new List<CanEditUserInventory>();
1205 1205
1206 public void addCheckCanEditAvatarInventory(CanEditAvatarInventory delegateFunc) 1206 public void addCheckCanEditUserInventory(CanEditUserInventory delegateFunc)
1207 { 1207 {
1208 if (!CanEditAvatarInventoryCheckFunctions.Contains(delegateFunc)) 1208 if (!CanEditUserInventoryCheckFunctions.Contains(delegateFunc))
1209 CanEditAvatarInventoryCheckFunctions.Add(delegateFunc); 1209 CanEditUserInventoryCheckFunctions.Add(delegateFunc);
1210 } 1210 }
1211 1211
1212 public void removeCheckCanEditAvatarInventory(CanEditAvatarInventory delegateFunc) 1212 public void removeCheckCanEditUserInventory(CanEditUserInventory delegateFunc)
1213 { 1213 {
1214 if (CanEditAvatarInventoryCheckFunctions.Contains(delegateFunc)) 1214 if (CanEditUserInventoryCheckFunctions.Contains(delegateFunc))
1215 CanEditAvatarInventoryCheckFunctions.Remove(delegateFunc); 1215 CanEditUserInventoryCheckFunctions.Remove(delegateFunc);
1216 } 1216 }
1217 1217
1218 /// <summary> 1218 /// <summary>
@@ -1221,9 +1221,9 @@ namespace OpenSim.Region.Environment.Scenes
1221 /// <param name="itemID"></param> 1221 /// <param name="itemID"></param>
1222 /// <param name="userID"></param> 1222 /// <param name="userID"></param>
1223 /// <returns></returns> 1223 /// <returns></returns>
1224 public bool ExternalChecksCanEditAvatarInventory(UUID itemID, UUID userID) 1224 public bool ExternalChecksCanEditUserInventory(UUID itemID, UUID userID)
1225 { 1225 {
1226 foreach (CanEditAvatarInventory check in CanEditAvatarInventoryCheckFunctions) 1226 foreach (CanEditUserInventory check in CanEditUserInventoryCheckFunctions)
1227 { 1227 {
1228 if (check(itemID, userID) == false) 1228 if (check(itemID, userID) == false)
1229 { 1229 {
@@ -1234,20 +1234,20 @@ namespace OpenSim.Region.Environment.Scenes
1234 return true; 1234 return true;
1235 } 1235 }
1236 1236
1237 public delegate bool CanCopyAvatarInventory(UUID itemID, UUID userID); 1237 public delegate bool CanCopyUserInventory(UUID itemID, UUID userID);
1238 private List<CanCopyAvatarInventory> CanCopyAvatarInventoryCheckFunctions 1238 private List<CanCopyUserInventory> CanCopyUserInventoryCheckFunctions
1239 = new List<CanCopyAvatarInventory>(); 1239 = new List<CanCopyUserInventory>();
1240 1240
1241 public void addCheckCanCopyAvatarInventory(CanCopyAvatarInventory delegateFunc) 1241 public void addCheckCanCopyUserInventory(CanCopyUserInventory delegateFunc)
1242 { 1242 {
1243 if (!CanCopyAvatarInventoryCheckFunctions.Contains(delegateFunc)) 1243 if (!CanCopyUserInventoryCheckFunctions.Contains(delegateFunc))
1244 CanCopyAvatarInventoryCheckFunctions.Add(delegateFunc); 1244 CanCopyUserInventoryCheckFunctions.Add(delegateFunc);
1245 } 1245 }
1246 1246
1247 public void removeCheckCanCopyAvatarInventory(CanCopyAvatarInventory delegateFunc) 1247 public void removeCheckCanCopyUserInventory(CanCopyUserInventory delegateFunc)
1248 { 1248 {
1249 if (CanCopyAvatarInventoryCheckFunctions.Contains(delegateFunc)) 1249 if (CanCopyUserInventoryCheckFunctions.Contains(delegateFunc))
1250 CanCopyAvatarInventoryCheckFunctions.Remove(delegateFunc); 1250 CanCopyUserInventoryCheckFunctions.Remove(delegateFunc);
1251 } 1251 }
1252 1252
1253 /// <summary> 1253 /// <summary>
@@ -1256,9 +1256,9 @@ namespace OpenSim.Region.Environment.Scenes
1256 /// <param name="itemID"></param> 1256 /// <param name="itemID"></param>
1257 /// <param name="userID"></param> 1257 /// <param name="userID"></param>
1258 /// <returns></returns> 1258 /// <returns></returns>
1259 public bool ExternalChecksCanCopyAvatarInventory(UUID itemID, UUID userID) 1259 public bool ExternalChecksCanCopyUserInventory(UUID itemID, UUID userID)
1260 { 1260 {
1261 foreach (CanCopyAvatarInventory check in CanCopyAvatarInventoryCheckFunctions) 1261 foreach (CanCopyUserInventory check in CanCopyUserInventoryCheckFunctions)
1262 { 1262 {
1263 if (check(itemID, userID) == false) 1263 if (check(itemID, userID) == false)
1264 { 1264 {
@@ -1269,20 +1269,20 @@ namespace OpenSim.Region.Environment.Scenes
1269 return true; 1269 return true;
1270 } 1270 }
1271 1271
1272 public delegate bool CanDeleteAvatarInventory(UUID itemID, UUID userID); 1272 public delegate bool CanDeleteUserInventory(UUID itemID, UUID userID);
1273 private List<CanDeleteAvatarInventory> CanDeleteAvatarInventoryCheckFunctions 1273 private List<CanDeleteUserInventory> CanDeleteUserInventoryCheckFunctions
1274 = new List<CanDeleteAvatarInventory>(); 1274 = new List<CanDeleteUserInventory>();
1275 1275
1276 public void addCheckCanDeleteAvatarInventory(CanDeleteAvatarInventory delegateFunc) 1276 public void addCheckCanDeleteUserInventory(CanDeleteUserInventory delegateFunc)
1277 { 1277 {
1278 if (!CanDeleteAvatarInventoryCheckFunctions.Contains(delegateFunc)) 1278 if (!CanDeleteUserInventoryCheckFunctions.Contains(delegateFunc))
1279 CanDeleteAvatarInventoryCheckFunctions.Add(delegateFunc); 1279 CanDeleteUserInventoryCheckFunctions.Add(delegateFunc);
1280 } 1280 }
1281 1281
1282 public void removeCheckCanDeleteAvatarInventory(CanDeleteAvatarInventory delegateFunc) 1282 public void removeCheckCanDeleteUserInventory(CanDeleteUserInventory delegateFunc)
1283 { 1283 {
1284 if (CanDeleteAvatarInventoryCheckFunctions.Contains(delegateFunc)) 1284 if (CanDeleteUserInventoryCheckFunctions.Contains(delegateFunc))
1285 CanDeleteAvatarInventoryCheckFunctions.Remove(delegateFunc); 1285 CanDeleteUserInventoryCheckFunctions.Remove(delegateFunc);
1286 } 1286 }
1287 1287
1288 /// <summary> 1288 /// <summary>
@@ -1291,9 +1291,9 @@ namespace OpenSim.Region.Environment.Scenes
1291 /// <param name="itemID"></param> 1291 /// <param name="itemID"></param>
1292 /// <param name="userID"></param> 1292 /// <param name="userID"></param>
1293 /// <returns></returns> 1293 /// <returns></returns>
1294 public bool ExternalChecksCanDeleteAvatarInventory(UUID itemID, UUID userID) 1294 public bool ExternalChecksCanDeleteUserInventory(UUID itemID, UUID userID)
1295 { 1295 {
1296 foreach (CanDeleteAvatarInventory check in CanDeleteAvatarInventoryCheckFunctions) 1296 foreach (CanDeleteUserInventory check in CanDeleteUserInventoryCheckFunctions)
1297 { 1297 {
1298 if (check(itemID, userID) == false) 1298 if (check(itemID, userID) == false)
1299 { 1299 {