diff options
author | Melanie Thielker | 2017-01-05 19:07:37 +0000 |
---|---|---|
committer | Melanie Thielker | 2017-01-05 19:07:37 +0000 |
commit | b16abc8166c29585cb76cc55c3bdd76e5833cb4f (patch) | |
tree | 6a34f465a74b7a3a6dc00a3d7aa8dcc25ac3e3a5 /OpenSim/Region/Framework/Scenes/Scene.Permissions.cs | |
parent | Make it possible to disable the bakes module in the way it is described in co... (diff) | |
download | opensim-SC_OLD-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.zip opensim-SC_OLD-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.tar.gz opensim-SC_OLD-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.tar.bz2 opensim-SC_OLD-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.tar.xz |
Massive tab and trailing space cleanup
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.Permissions.cs | 58 |
1 files changed, 29 insertions, 29 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Permissions.cs b/OpenSim/Region/Framework/Scenes/Scene.Permissions.cs index b26b789..893b38c 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.Permissions.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.Permissions.cs | |||
@@ -35,7 +35,7 @@ using OpenSim.Framework; | |||
35 | using OpenSim.Region.Framework.Interfaces; | 35 | using OpenSim.Region.Framework.Interfaces; |
36 | 36 | ||
37 | namespace OpenSim.Region.Framework.Scenes | 37 | namespace OpenSim.Region.Framework.Scenes |
38 | { | 38 | { |
39 | #region Delegates | 39 | #region Delegates |
40 | public delegate uint GenerateClientFlagsHandler(UUID userID, UUID objectID); | 40 | public delegate uint GenerateClientFlagsHandler(UUID userID, UUID objectID); |
41 | public delegate void SetBypassPermissionsHandler(bool value); | 41 | public delegate void SetBypassPermissionsHandler(bool value); |
@@ -98,7 +98,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
98 | public class ScenePermissions | 98 | public class ScenePermissions |
99 | { | 99 | { |
100 | // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 100 | // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
101 | 101 | ||
102 | private Scene m_scene; | 102 | private Scene m_scene; |
103 | 103 | ||
104 | public ScenePermissions(Scene scene) | 104 | public ScenePermissions(Scene scene) |
@@ -261,7 +261,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
261 | public bool CanDeleteObject(UUID objectID, UUID deleter) | 261 | public bool CanDeleteObject(UUID objectID, UUID deleter) |
262 | { | 262 | { |
263 | bool result = true; | 263 | bool result = true; |
264 | 264 | ||
265 | DeleteObjectHandler handler = OnDeleteObject; | 265 | DeleteObjectHandler handler = OnDeleteObject; |
266 | if (handler != null) | 266 | if (handler != null) |
267 | { | 267 | { |
@@ -275,14 +275,14 @@ namespace OpenSim.Region.Framework.Scenes | |||
275 | } | 275 | } |
276 | } | 276 | } |
277 | } | 277 | } |
278 | 278 | ||
279 | return result; | 279 | return result; |
280 | } | 280 | } |
281 | 281 | ||
282 | public bool CanTransferObject(UUID objectID, UUID recipient) | 282 | public bool CanTransferObject(UUID objectID, UUID recipient) |
283 | { | 283 | { |
284 | bool result = true; | 284 | bool result = true; |
285 | 285 | ||
286 | TransferObjectHandler handler = OnTransferObject; | 286 | TransferObjectHandler handler = OnTransferObject; |
287 | if (handler != null) | 287 | if (handler != null) |
288 | { | 288 | { |
@@ -296,7 +296,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
296 | } | 296 | } |
297 | } | 297 | } |
298 | } | 298 | } |
299 | 299 | ||
300 | return result; | 300 | return result; |
301 | } | 301 | } |
302 | 302 | ||
@@ -306,7 +306,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
306 | public bool CanTakeObject(UUID objectID, UUID AvatarTakingUUID) | 306 | public bool CanTakeObject(UUID objectID, UUID AvatarTakingUUID) |
307 | { | 307 | { |
308 | bool result = true; | 308 | bool result = true; |
309 | 309 | ||
310 | TakeObjectHandler handler = OnTakeObject; | 310 | TakeObjectHandler handler = OnTakeObject; |
311 | if (handler != null) | 311 | if (handler != null) |
312 | { | 312 | { |
@@ -320,11 +320,11 @@ namespace OpenSim.Region.Framework.Scenes | |||
320 | } | 320 | } |
321 | } | 321 | } |
322 | } | 322 | } |
323 | 323 | ||
324 | // m_log.DebugFormat( | 324 | // m_log.DebugFormat( |
325 | // "[SCENE PERMISSIONS]: CanTakeObject() fired for object {0}, taker {1}, result {2}", | 325 | // "[SCENE PERMISSIONS]: CanTakeObject() fired for object {0}, taker {1}, result {2}", |
326 | // objectID, AvatarTakingUUID, result); | 326 | // objectID, AvatarTakingUUID, result); |
327 | 327 | ||
328 | return result; | 328 | return result; |
329 | } | 329 | } |
330 | 330 | ||
@@ -363,7 +363,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
363 | public bool CanTakeCopyObject(UUID objectID, UUID userID) | 363 | public bool CanTakeCopyObject(UUID objectID, UUID userID) |
364 | { | 364 | { |
365 | bool result = true; | 365 | bool result = true; |
366 | 366 | ||
367 | TakeCopyObjectHandler handler = OnTakeCopyObject; | 367 | TakeCopyObjectHandler handler = OnTakeCopyObject; |
368 | if (handler != null) | 368 | if (handler != null) |
369 | { | 369 | { |
@@ -377,11 +377,11 @@ namespace OpenSim.Region.Framework.Scenes | |||
377 | } | 377 | } |
378 | } | 378 | } |
379 | } | 379 | } |
380 | 380 | ||
381 | // m_log.DebugFormat( | 381 | // m_log.DebugFormat( |
382 | // "[SCENE PERMISSIONS]: CanTakeCopyObject() fired for object {0}, user {1}, result {2}", | 382 | // "[SCENE PERMISSIONS]: CanTakeCopyObject() fired for object {0}, user {1}, result {2}", |
383 | // objectID, userID, result); | 383 | // objectID, userID, result); |
384 | 384 | ||
385 | return result; | 385 | return result; |
386 | } | 386 | } |
387 | 387 | ||
@@ -478,7 +478,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
478 | public bool CanReturnObjects(ILandObject land, UUID user, List<SceneObjectGroup> objects) | 478 | public bool CanReturnObjects(ILandObject land, UUID user, List<SceneObjectGroup> objects) |
479 | { | 479 | { |
480 | bool result = true; | 480 | bool result = true; |
481 | 481 | ||
482 | ReturnObjectsHandler handler = OnReturnObjects; | 482 | ReturnObjectsHandler handler = OnReturnObjects; |
483 | if (handler != null) | 483 | if (handler != null) |
484 | { | 484 | { |
@@ -492,11 +492,11 @@ namespace OpenSim.Region.Framework.Scenes | |||
492 | } | 492 | } |
493 | } | 493 | } |
494 | } | 494 | } |
495 | 495 | ||
496 | // m_log.DebugFormat( | 496 | // m_log.DebugFormat( |
497 | // "[SCENE PERMISSIONS]: CanReturnObjects() fired for user {0} for {1} objects on {2}, result {3}", | 497 | // "[SCENE PERMISSIONS]: CanReturnObjects() fired for user {0} for {1} objects on {2}, result {3}", |
498 | // user, objects.Count, land.LandData.Name, result); | 498 | // user, objects.Count, land.LandData.Name, result); |
499 | 499 | ||
500 | return result; | 500 | return result; |
501 | } | 501 | } |
502 | 502 | ||
@@ -1004,7 +1004,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1004 | } | 1004 | } |
1005 | return true; | 1005 | return true; |
1006 | } | 1006 | } |
1007 | 1007 | ||
1008 | public bool CanTransferObjectInventory(UUID itemID, UUID objectID, UUID userID) | 1008 | public bool CanTransferObjectInventory(UUID itemID, UUID objectID, UUID userID) |
1009 | { | 1009 | { |
1010 | TransferObjectInventoryHandler handler = OnTransferObjectInventory; | 1010 | TransferObjectInventoryHandler handler = OnTransferObjectInventory; |
@@ -1019,7 +1019,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1019 | } | 1019 | } |
1020 | return true; | 1020 | return true; |
1021 | } | 1021 | } |
1022 | 1022 | ||
1023 | /// <summary> | 1023 | /// <summary> |
1024 | /// Check whether the specified user is allowed to create the given inventory type in their inventory. | 1024 | /// Check whether the specified user is allowed to create the given inventory type in their inventory. |
1025 | /// </summary> | 1025 | /// </summary> |
@@ -1039,8 +1039,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
1039 | } | 1039 | } |
1040 | } | 1040 | } |
1041 | return true; | 1041 | return true; |
1042 | } | 1042 | } |
1043 | 1043 | ||
1044 | /// <summary> | 1044 | /// <summary> |
1045 | /// Check whether the specified user is allowed to edit the given inventory item within their own inventory. | 1045 | /// Check whether the specified user is allowed to edit the given inventory item within their own inventory. |
1046 | /// </summary> | 1046 | /// </summary> |
@@ -1061,7 +1061,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1061 | } | 1061 | } |
1062 | return true; | 1062 | return true; |
1063 | } | 1063 | } |
1064 | 1064 | ||
1065 | /// <summary> | 1065 | /// <summary> |
1066 | /// Check whether the specified user is allowed to copy the given inventory item from their own inventory. | 1066 | /// Check whether the specified user is allowed to copy the given inventory item from their own inventory. |
1067 | /// </summary> | 1067 | /// </summary> |
@@ -1082,7 +1082,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1082 | } | 1082 | } |
1083 | return true; | 1083 | return true; |
1084 | } | 1084 | } |
1085 | 1085 | ||
1086 | /// <summary> | 1086 | /// <summary> |
1087 | /// Check whether the specified user is allowed to edit the given inventory item within their own inventory. | 1087 | /// Check whether the specified user is allowed to edit the given inventory item within their own inventory. |
1088 | /// </summary> | 1088 | /// </summary> |
@@ -1103,7 +1103,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1103 | } | 1103 | } |
1104 | return true; | 1104 | return true; |
1105 | } | 1105 | } |
1106 | 1106 | ||
1107 | public bool CanTransferUserInventory(UUID itemID, UUID userID, UUID recipientID) | 1107 | public bool CanTransferUserInventory(UUID itemID, UUID userID, UUID recipientID) |
1108 | { | 1108 | { |
1109 | TransferUserInventoryHandler handler = OnTransferUserInventory; | 1109 | TransferUserInventoryHandler handler = OnTransferUserInventory; |
@@ -1118,7 +1118,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1118 | } | 1118 | } |
1119 | return true; | 1119 | return true; |
1120 | } | 1120 | } |
1121 | 1121 | ||
1122 | public bool CanTeleport(UUID userID) | 1122 | public bool CanTeleport(UUID userID) |
1123 | { | 1123 | { |
1124 | TeleportHandler handler = OnTeleport; | 1124 | TeleportHandler handler = OnTeleport; |
@@ -1133,7 +1133,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1133 | } | 1133 | } |
1134 | return true; | 1134 | return true; |
1135 | } | 1135 | } |
1136 | 1136 | ||
1137 | public bool CanControlPrimMedia(UUID userID, UUID primID, int face) | 1137 | public bool CanControlPrimMedia(UUID userID, UUID primID, int face) |
1138 | { | 1138 | { |
1139 | ControlPrimMediaHandler handler = OnControlPrimMedia; | 1139 | ControlPrimMediaHandler handler = OnControlPrimMedia; |
@@ -1147,8 +1147,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
1147 | } | 1147 | } |
1148 | } | 1148 | } |
1149 | return true; | 1149 | return true; |
1150 | } | 1150 | } |
1151 | 1151 | ||
1152 | public bool CanInteractWithPrimMedia(UUID userID, UUID primID, int face) | 1152 | public bool CanInteractWithPrimMedia(UUID userID, UUID primID, int face) |
1153 | { | 1153 | { |
1154 | InteractWithPrimMediaHandler handler = OnInteractWithPrimMedia; | 1154 | InteractWithPrimMediaHandler handler = OnInteractWithPrimMedia; |