diff options
author | Teravus Ovares | 2008-09-06 07:52:41 +0000 |
---|---|---|
committer | Teravus Ovares | 2008-09-06 07:52:41 +0000 |
commit | 7d89e122930be39e84a6d174548fa2d12ac0484a (patch) | |
tree | e5aa5752f988a9aba2a969f49e5e208985eda80c /OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs | |
parent | * minor: speculatively try a change to bamboo.build to see if this generates ... (diff) | |
download | opensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.zip opensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.gz opensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.bz2 opensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.xz |
* This is the fabled LibOMV update with all of the libOMV types from JHurliman
* This is a HUGE OMG update and will definitely have unknown side effects.. so this is really only for the strong hearted at this point. Regular people should let the dust settle.
* This has been tested to work with most basic functions. However.. make sure you back up 'everything' before using this. It's that big!
* Essentially we're back at square 1 in the testing phase.. so lets identify things that broke.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs | 132 |
1 files changed, 66 insertions, 66 deletions
diff --git a/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs b/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs index b9615ec..d92f33a 100644 --- a/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs +++ b/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs | |||
@@ -25,7 +25,7 @@ | |||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | */ | 26 | */ |
27 | 27 | ||
28 | using libsecondlife; | 28 | using OpenMetaverse; |
29 | using Nini.Config; | 29 | using Nini.Config; |
30 | using System; | 30 | using System; |
31 | using System.Collections; | 31 | using System.Collections; |
@@ -228,7 +228,7 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions | |||
228 | #endregion | 228 | #endregion |
229 | 229 | ||
230 | #region Helper Functions | 230 | #region Helper Functions |
231 | protected void SendPermissionError(LLUUID user, string reason) | 231 | protected void SendPermissionError(UUID user, string reason) |
232 | { | 232 | { |
233 | m_scene.EventManager.TriggerPermissionError(user, reason); | 233 | m_scene.EventManager.TriggerPermissionError(user, reason); |
234 | } | 234 | } |
@@ -238,14 +238,14 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions | |||
238 | m_log.Info("[PERMISSIONS]: " + permissionCalled + " was called from " + m_scene.RegionInfo.RegionName); | 238 | m_log.Info("[PERMISSIONS]: " + permissionCalled + " was called from " + m_scene.RegionInfo.RegionName); |
239 | } | 239 | } |
240 | 240 | ||
241 | protected bool IsAdministrator(LLUUID user) | 241 | protected bool IsAdministrator(UUID user) |
242 | { | 242 | { |
243 | if (m_scene.RegionInfo.MasterAvatarAssignedUUID != LLUUID.Zero) | 243 | if (m_scene.RegionInfo.MasterAvatarAssignedUUID != UUID.Zero) |
244 | { | 244 | { |
245 | if (m_RegionOwnerIsGod && (m_scene.RegionInfo.MasterAvatarAssignedUUID == user)) | 245 | if (m_RegionOwnerIsGod && (m_scene.RegionInfo.MasterAvatarAssignedUUID == user)) |
246 | return true; | 246 | return true; |
247 | } | 247 | } |
248 | if (m_scene.RegionInfo.EstateSettings.EstateOwner != LLUUID.Zero) | 248 | if (m_scene.RegionInfo.EstateSettings.EstateOwner != UUID.Zero) |
249 | { | 249 | { |
250 | if (m_scene.RegionInfo.EstateSettings.EstateOwner == user) | 250 | if (m_scene.RegionInfo.EstateSettings.EstateOwner == user) |
251 | return true; | 251 | return true; |
@@ -263,7 +263,7 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions | |||
263 | return false; | 263 | return false; |
264 | } | 264 | } |
265 | 265 | ||
266 | protected bool IsEstateManager(LLUUID user) | 266 | protected bool IsEstateManager(UUID user) |
267 | { | 267 | { |
268 | return m_scene.RegionInfo.EstateSettings.IsEstateManager(user); | 268 | return m_scene.RegionInfo.EstateSettings.IsEstateManager(user); |
269 | } | 269 | } |
@@ -286,7 +286,7 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions | |||
286 | 286 | ||
287 | #region Object Permissions | 287 | #region Object Permissions |
288 | 288 | ||
289 | public uint GenerateClientFlags(LLUUID user, LLUUID objID) | 289 | public uint GenerateClientFlags(UUID user, UUID objID) |
290 | { | 290 | { |
291 | // Here's the way this works, | 291 | // Here's the way this works, |
292 | // ObjectFlags and Permission flags are two different enumerations | 292 | // ObjectFlags and Permission flags are two different enumerations |
@@ -306,27 +306,27 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions | |||
306 | return (uint)0; | 306 | return (uint)0; |
307 | 307 | ||
308 | uint objflags = task.GetEffectiveObjectFlags(); | 308 | uint objflags = task.GetEffectiveObjectFlags(); |
309 | LLUUID objectOwner = task.OwnerID; | 309 | UUID objectOwner = task.OwnerID; |
310 | 310 | ||
311 | 311 | ||
312 | // Remove any of the objectFlags that are temporary. These will get added back if appropriate | 312 | // Remove any of the objectFlags that are temporary. These will get added back if appropriate |
313 | // in the next bit of code | 313 | // in the next bit of code |
314 | 314 | ||
315 | objflags &= (uint) | 315 | objflags &= (uint) |
316 | ~(LLObject.ObjectFlags.ObjectCopy | // Tells client you can copy the object | 316 | ~(PrimFlags.ObjectCopy | // Tells client you can copy the object |
317 | LLObject.ObjectFlags.ObjectModify | // tells client you can modify the object | 317 | PrimFlags.ObjectModify | // tells client you can modify the object |
318 | LLObject.ObjectFlags.ObjectMove | // tells client that you can move the object (only, no mod) | 318 | PrimFlags.ObjectMove | // tells client that you can move the object (only, no mod) |
319 | LLObject.ObjectFlags.ObjectTransfer | // tells the client that you can /take/ the object if you don't own it | 319 | PrimFlags.ObjectTransfer | // tells the client that you can /take/ the object if you don't own it |
320 | LLObject.ObjectFlags.ObjectYouOwner | // Tells client that you're the owner of the object | 320 | PrimFlags.ObjectYouOwner | // Tells client that you're the owner of the object |
321 | LLObject.ObjectFlags.ObjectAnyOwner | // Tells client that someone owns the object | 321 | PrimFlags.ObjectAnyOwner | // Tells client that someone owns the object |
322 | LLObject.ObjectFlags.ObjectOwnerModify | // Tells client that you're the owner of the object | 322 | PrimFlags.ObjectOwnerModify | // Tells client that you're the owner of the object |
323 | LLObject.ObjectFlags.ObjectYouOfficer // Tells client that you've got group object editing permission. Used when ObjectGroupOwned is set | 323 | PrimFlags.ObjectYouOfficer // Tells client that you've got group object editing permission. Used when ObjectGroupOwned is set |
324 | ); | 324 | ); |
325 | 325 | ||
326 | // Creating the three ObjectFlags options for this method to choose from. | 326 | // Creating the three ObjectFlags options for this method to choose from. |
327 | // Customize the OwnerMask | 327 | // Customize the OwnerMask |
328 | uint objectOwnerMask = ApplyObjectModifyMasks(task.OwnerMask, objflags); | 328 | uint objectOwnerMask = ApplyObjectModifyMasks(task.OwnerMask, objflags); |
329 | objectOwnerMask |= (uint)LLObject.ObjectFlags.ObjectYouOwner | (uint)LLObject.ObjectFlags.ObjectAnyOwner | (uint)LLObject.ObjectFlags.ObjectOwnerModify; | 329 | objectOwnerMask |= (uint)PrimFlags.ObjectYouOwner | (uint)PrimFlags.ObjectAnyOwner | (uint)PrimFlags.ObjectOwnerModify; |
330 | 330 | ||
331 | // Customize the GroupMask | 331 | // Customize the GroupMask |
332 | // uint objectGroupMask = ApplyObjectModifyMasks(task.GroupMask, objflags); | 332 | // uint objectGroupMask = ApplyObjectModifyMasks(task.GroupMask, objflags); |
@@ -336,8 +336,8 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions | |||
336 | 336 | ||
337 | 337 | ||
338 | // Hack to allow collaboration until Groups and Group Permissions are implemented | 338 | // Hack to allow collaboration until Groups and Group Permissions are implemented |
339 | if ((objectEveryoneMask & (uint)LLObject.ObjectFlags.ObjectMove) != 0) | 339 | if ((objectEveryoneMask & (uint)PrimFlags.ObjectMove) != 0) |
340 | objectEveryoneMask |= (uint)LLObject.ObjectFlags.ObjectModify; | 340 | objectEveryoneMask |= (uint)PrimFlags.ObjectModify; |
341 | 341 | ||
342 | if (m_bypassPermissions) | 342 | if (m_bypassPermissions) |
343 | return objectOwnerMask; | 343 | return objectOwnerMask; |
@@ -378,28 +378,28 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions | |||
378 | 378 | ||
379 | if ((setPermissionMask & (uint)PermissionMask.Copy) != 0) | 379 | if ((setPermissionMask & (uint)PermissionMask.Copy) != 0) |
380 | { | 380 | { |
381 | objectFlagsMask |= (uint)LLObject.ObjectFlags.ObjectCopy; | 381 | objectFlagsMask |= (uint)PrimFlags.ObjectCopy; |
382 | } | 382 | } |
383 | 383 | ||
384 | if ((setPermissionMask & (uint)PermissionMask.Move) != 0) | 384 | if ((setPermissionMask & (uint)PermissionMask.Move) != 0) |
385 | { | 385 | { |
386 | objectFlagsMask |= (uint)LLObject.ObjectFlags.ObjectMove; | 386 | objectFlagsMask |= (uint)PrimFlags.ObjectMove; |
387 | } | 387 | } |
388 | 388 | ||
389 | if ((setPermissionMask & (uint)PermissionMask.Modify) != 0) | 389 | if ((setPermissionMask & (uint)PermissionMask.Modify) != 0) |
390 | { | 390 | { |
391 | objectFlagsMask |= (uint)LLObject.ObjectFlags.ObjectModify; | 391 | objectFlagsMask |= (uint)PrimFlags.ObjectModify; |
392 | } | 392 | } |
393 | 393 | ||
394 | if ((setPermissionMask & (uint)PermissionMask.Transfer) != 0) | 394 | if ((setPermissionMask & (uint)PermissionMask.Transfer) != 0) |
395 | { | 395 | { |
396 | objectFlagsMask |= (uint)LLObject.ObjectFlags.ObjectTransfer; | 396 | objectFlagsMask |= (uint)PrimFlags.ObjectTransfer; |
397 | } | 397 | } |
398 | 398 | ||
399 | return objectFlagsMask; | 399 | return objectFlagsMask; |
400 | } | 400 | } |
401 | 401 | ||
402 | protected bool GenericObjectPermission(LLUUID currentUser, LLUUID objId, bool denyOnLocked) | 402 | protected bool GenericObjectPermission(UUID currentUser, UUID objId, bool denyOnLocked) |
403 | { | 403 | { |
404 | // Default: deny | 404 | // Default: deny |
405 | bool permission = false; | 405 | bool permission = false; |
@@ -419,7 +419,7 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions | |||
419 | 419 | ||
420 | SceneObjectGroup group = (SceneObjectGroup)m_scene.Entities[objId]; | 420 | SceneObjectGroup group = (SceneObjectGroup)m_scene.Entities[objId]; |
421 | 421 | ||
422 | LLUUID objectOwner = group.OwnerID; | 422 | UUID objectOwner = group.OwnerID; |
423 | locked = ((group.RootPart.OwnerMask & PERM_LOCKED) == 0); | 423 | locked = ((group.RootPart.OwnerMask & PERM_LOCKED) == 0); |
424 | 424 | ||
425 | // People shouldn't be able to do anything with locked objects, except the Administrator | 425 | // People shouldn't be able to do anything with locked objects, except the Administrator |
@@ -472,7 +472,7 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions | |||
472 | #endregion | 472 | #endregion |
473 | 473 | ||
474 | #region Generic Permissions | 474 | #region Generic Permissions |
475 | protected bool GenericCommunicationPermission(LLUUID user, LLUUID target) | 475 | protected bool GenericCommunicationPermission(UUID user, UUID target) |
476 | { | 476 | { |
477 | // Setting this to true so that cool stuff can happen until we define what determines Generic Communication Permission | 477 | // Setting this to true so that cool stuff can happen until we define what determines Generic Communication Permission |
478 | bool permission = true; | 478 | bool permission = true; |
@@ -491,7 +491,7 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions | |||
491 | return permission; | 491 | return permission; |
492 | } | 492 | } |
493 | 493 | ||
494 | public bool GenericEstatePermission(LLUUID user) | 494 | public bool GenericEstatePermission(UUID user) |
495 | { | 495 | { |
496 | // Default: deny | 496 | // Default: deny |
497 | bool permission = false; | 497 | bool permission = false; |
@@ -507,7 +507,7 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions | |||
507 | return permission; | 507 | return permission; |
508 | } | 508 | } |
509 | 509 | ||
510 | protected bool GenericParcelPermission(LLUUID user, ILandObject parcel) | 510 | protected bool GenericParcelPermission(UUID user, ILandObject parcel) |
511 | { | 511 | { |
512 | bool permission = false; | 512 | bool permission = false; |
513 | 513 | ||
@@ -534,7 +534,7 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions | |||
534 | return permission; | 534 | return permission; |
535 | } | 535 | } |
536 | 536 | ||
537 | protected bool GenericParcelPermission(LLUUID user, LLVector3 pos) | 537 | protected bool GenericParcelPermission(UUID user, Vector3 pos) |
538 | { | 538 | { |
539 | ILandObject parcel = m_scene.LandChannel.GetLandObject(pos.X, pos.Y); | 539 | ILandObject parcel = m_scene.LandChannel.GetLandObject(pos.X, pos.Y); |
540 | if (parcel == null) return false; | 540 | if (parcel == null) return false; |
@@ -543,7 +543,7 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions | |||
543 | #endregion | 543 | #endregion |
544 | 544 | ||
545 | #region Permission Checks | 545 | #region Permission Checks |
546 | private bool CanAbandonParcel(LLUUID user, ILandObject parcel, Scene scene) | 546 | private bool CanAbandonParcel(UUID user, ILandObject parcel, Scene scene) |
547 | { | 547 | { |
548 | DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name); | 548 | DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name); |
549 | if (m_bypassPermissions) return m_bypassPermissionsValue; | 549 | if (m_bypassPermissions) return m_bypassPermissionsValue; |
@@ -551,7 +551,7 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions | |||
551 | return GenericParcelPermission(user, parcel); | 551 | return GenericParcelPermission(user, parcel); |
552 | } | 552 | } |
553 | 553 | ||
554 | private bool CanReclaimParcel(LLUUID user, ILandObject parcel, Scene scene) | 554 | private bool CanReclaimParcel(UUID user, ILandObject parcel, Scene scene) |
555 | { | 555 | { |
556 | DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name); | 556 | DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name); |
557 | if (m_bypassPermissions) return m_bypassPermissionsValue; | 557 | if (m_bypassPermissions) return m_bypassPermissionsValue; |
@@ -559,7 +559,7 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions | |||
559 | return GenericParcelPermission(user, parcel); | 559 | return GenericParcelPermission(user, parcel); |
560 | } | 560 | } |
561 | 561 | ||
562 | private bool CanBeGodLike(LLUUID user, Scene scene) | 562 | private bool CanBeGodLike(UUID user, Scene scene) |
563 | { | 563 | { |
564 | DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name); | 564 | DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name); |
565 | if (m_bypassPermissions) return m_bypassPermissionsValue; | 565 | if (m_bypassPermissions) return m_bypassPermissionsValue; |
@@ -567,7 +567,7 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions | |||
567 | return IsAdministrator(user); | 567 | return IsAdministrator(user); |
568 | } | 568 | } |
569 | 569 | ||
570 | private bool CanDuplicateObject(int objectCount, LLUUID objectID, LLUUID owner, Scene scene, LLVector3 objectPosition) | 570 | private bool CanDuplicateObject(int objectCount, UUID objectID, UUID owner, Scene scene, Vector3 objectPosition) |
571 | { | 571 | { |
572 | DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name); | 572 | DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name); |
573 | if (m_bypassPermissions) return m_bypassPermissionsValue; | 573 | if (m_bypassPermissions) return m_bypassPermissionsValue; |
@@ -581,7 +581,7 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions | |||
581 | return CanRezObject(objectCount, owner, objectPosition, scene); | 581 | return CanRezObject(objectCount, owner, objectPosition, scene); |
582 | } | 582 | } |
583 | 583 | ||
584 | private bool CanDeleteObject(LLUUID objectID, LLUUID deleter, Scene scene) | 584 | private bool CanDeleteObject(UUID objectID, UUID deleter, Scene scene) |
585 | { | 585 | { |
586 | DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name); | 586 | DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name); |
587 | if (m_bypassPermissions) return m_bypassPermissionsValue; | 587 | if (m_bypassPermissions) return m_bypassPermissionsValue; |
@@ -589,7 +589,7 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions | |||
589 | return GenericObjectPermission(deleter, objectID, false); | 589 | return GenericObjectPermission(deleter, objectID, false); |
590 | } | 590 | } |
591 | 591 | ||
592 | private bool CanEditObject(LLUUID objectID, LLUUID editorID, Scene scene) | 592 | private bool CanEditObject(UUID objectID, UUID editorID, Scene scene) |
593 | { | 593 | { |
594 | DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name); | 594 | DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name); |
595 | if (m_bypassPermissions) return m_bypassPermissionsValue; | 595 | if (m_bypassPermissions) return m_bypassPermissionsValue; |
@@ -598,7 +598,7 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions | |||
598 | return GenericObjectPermission(editorID, objectID, false); | 598 | return GenericObjectPermission(editorID, objectID, false); |
599 | } | 599 | } |
600 | 600 | ||
601 | private bool CanEditParcel(LLUUID user, ILandObject parcel, Scene scene) | 601 | private bool CanEditParcel(UUID user, ILandObject parcel, Scene scene) |
602 | { | 602 | { |
603 | DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name); | 603 | DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name); |
604 | if (m_bypassPermissions) return m_bypassPermissionsValue; | 604 | if (m_bypassPermissions) return m_bypassPermissionsValue; |
@@ -606,7 +606,7 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions | |||
606 | return GenericParcelPermission(user, parcel); | 606 | return GenericParcelPermission(user, parcel); |
607 | } | 607 | } |
608 | 608 | ||
609 | private bool CanEditScript(LLUUID script, LLUUID objectID, LLUUID user, Scene scene) | 609 | private bool CanEditScript(UUID script, UUID objectID, UUID user, Scene scene) |
610 | { | 610 | { |
611 | DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name); | 611 | DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name); |
612 | if (m_bypassPermissions) return m_bypassPermissionsValue; | 612 | if (m_bypassPermissions) return m_bypassPermissionsValue; |
@@ -614,7 +614,7 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions | |||
614 | return false; | 614 | return false; |
615 | } | 615 | } |
616 | 616 | ||
617 | private bool CanEditNotecard(LLUUID notecard, LLUUID objectID, LLUUID user, Scene scene) | 617 | private bool CanEditNotecard(UUID notecard, UUID objectID, UUID user, Scene scene) |
618 | { | 618 | { |
619 | DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name); | 619 | DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name); |
620 | if (m_bypassPermissions) return m_bypassPermissionsValue; | 620 | if (m_bypassPermissions) return m_bypassPermissionsValue; |
@@ -622,7 +622,7 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions | |||
622 | return true; | 622 | return true; |
623 | } | 623 | } |
624 | 624 | ||
625 | private bool CanInstantMessage(LLUUID user, LLUUID target, Scene startScene) | 625 | private bool CanInstantMessage(UUID user, UUID target, Scene startScene) |
626 | { | 626 | { |
627 | DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name); | 627 | DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name); |
628 | if (m_bypassPermissions) return m_bypassPermissionsValue; | 628 | if (m_bypassPermissions) return m_bypassPermissionsValue; |
@@ -631,7 +631,7 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions | |||
631 | return GenericCommunicationPermission(user, target); | 631 | return GenericCommunicationPermission(user, target); |
632 | } | 632 | } |
633 | 633 | ||
634 | private bool CanInventoryTransfer(LLUUID user, LLUUID target, Scene startScene) | 634 | private bool CanInventoryTransfer(UUID user, UUID target, Scene startScene) |
635 | { | 635 | { |
636 | DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name); | 636 | DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name); |
637 | if (m_bypassPermissions) return m_bypassPermissionsValue; | 637 | if (m_bypassPermissions) return m_bypassPermissionsValue; |
@@ -639,7 +639,7 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions | |||
639 | return GenericCommunicationPermission(user, target); | 639 | return GenericCommunicationPermission(user, target); |
640 | } | 640 | } |
641 | 641 | ||
642 | private bool CanIssueEstateCommand(LLUUID user, Scene requestFromScene, bool ownerCommand) | 642 | private bool CanIssueEstateCommand(UUID user, Scene requestFromScene, bool ownerCommand) |
643 | { | 643 | { |
644 | DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name); | 644 | DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name); |
645 | if (m_bypassPermissions) return m_bypassPermissionsValue; | 645 | if (m_bypassPermissions) return m_bypassPermissionsValue; |
@@ -656,7 +656,7 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions | |||
656 | return GenericEstatePermission(user); | 656 | return GenericEstatePermission(user); |
657 | } | 657 | } |
658 | 658 | ||
659 | private bool CanMoveObject(LLUUID objectID, LLUUID moverID, Scene scene) | 659 | private bool CanMoveObject(UUID objectID, UUID moverID, Scene scene) |
660 | { | 660 | { |
661 | DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name); | 661 | DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name); |
662 | if (m_bypassPermissions) | 662 | if (m_bypassPermissions) |
@@ -696,10 +696,10 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions | |||
696 | SceneObjectGroup task = (SceneObjectGroup)m_scene.Entities[objectID]; | 696 | SceneObjectGroup task = (SceneObjectGroup)m_scene.Entities[objectID]; |
697 | 697 | ||
698 | 698 | ||
699 | // LLUUID taskOwner = null; | 699 | // UUID taskOwner = null; |
700 | // Added this because at this point in time it wouldn't be wise for | 700 | // Added this because at this point in time it wouldn't be wise for |
701 | // the administrator object permissions to take effect. | 701 | // the administrator object permissions to take effect. |
702 | // LLUUID objectOwner = task.OwnerID; | 702 | // UUID objectOwner = task.OwnerID; |
703 | 703 | ||
704 | // Anyone can move | 704 | // Anyone can move |
705 | if ((task.RootPart.EveryoneMask & PERM_MOVE) != 0) | 705 | if ((task.RootPart.EveryoneMask & PERM_MOVE) != 0) |
@@ -727,7 +727,7 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions | |||
727 | 727 | ||
728 | SceneObjectGroup group = (SceneObjectGroup)m_scene.Entities[objectID]; | 728 | SceneObjectGroup group = (SceneObjectGroup)m_scene.Entities[objectID]; |
729 | 729 | ||
730 | LLUUID objectOwner = group.OwnerID; | 730 | UUID objectOwner = group.OwnerID; |
731 | locked = ((group.RootPart.OwnerMask & PERM_LOCKED) == 0); | 731 | locked = ((group.RootPart.OwnerMask & PERM_LOCKED) == 0); |
732 | 732 | ||
733 | 733 | ||
@@ -747,7 +747,7 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions | |||
747 | return permission; | 747 | return permission; |
748 | } | 748 | } |
749 | 749 | ||
750 | private bool CanObjectEntry(LLUUID objectID, LLVector3 newPoint, Scene scene) | 750 | private bool CanObjectEntry(UUID objectID, Vector3 newPoint, Scene scene) |
751 | { | 751 | { |
752 | DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name); | 752 | DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name); |
753 | if (m_bypassPermissions) return m_bypassPermissionsValue; | 753 | if (m_bypassPermissions) return m_bypassPermissionsValue; |
@@ -764,7 +764,7 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions | |||
764 | return false; | 764 | return false; |
765 | } | 765 | } |
766 | 766 | ||
767 | if ((land.landData.Flags & ((int)Parcel.ParcelFlags.AllowAllObjectEntry)) != 0) | 767 | if ((land.landData.Flags & ((int)Parcel.ParcelFlags.AllowAPrimitiveEntry)) != 0) |
768 | { | 768 | { |
769 | return true; | 769 | return true; |
770 | } | 770 | } |
@@ -793,7 +793,7 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions | |||
793 | return false; | 793 | return false; |
794 | } | 794 | } |
795 | 795 | ||
796 | private bool CanReturnObject(LLUUID objectID, LLUUID returnerID, Scene scene) | 796 | private bool CanReturnObject(UUID objectID, UUID returnerID, Scene scene) |
797 | { | 797 | { |
798 | DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name); | 798 | DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name); |
799 | if (m_bypassPermissions) return m_bypassPermissionsValue; | 799 | if (m_bypassPermissions) return m_bypassPermissionsValue; |
@@ -801,7 +801,7 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions | |||
801 | return GenericObjectPermission(returnerID, objectID, false); | 801 | return GenericObjectPermission(returnerID, objectID, false); |
802 | } | 802 | } |
803 | 803 | ||
804 | private bool CanRezObject(int objectCount, LLUUID owner, LLVector3 objectPosition, Scene scene) | 804 | private bool CanRezObject(int objectCount, UUID owner, Vector3 objectPosition, Scene scene) |
805 | { | 805 | { |
806 | DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name); | 806 | DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name); |
807 | if (m_bypassPermissions) return m_bypassPermissionsValue; | 807 | if (m_bypassPermissions) return m_bypassPermissionsValue; |
@@ -830,7 +830,7 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions | |||
830 | return permission; | 830 | return permission; |
831 | } | 831 | } |
832 | 832 | ||
833 | private bool CanRunConsoleCommand(LLUUID user, Scene requestFromScene) | 833 | private bool CanRunConsoleCommand(UUID user, Scene requestFromScene) |
834 | { | 834 | { |
835 | DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name); | 835 | DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name); |
836 | if (m_bypassPermissions) return m_bypassPermissionsValue; | 836 | if (m_bypassPermissions) return m_bypassPermissionsValue; |
@@ -839,7 +839,7 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions | |||
839 | return IsAdministrator(user); | 839 | return IsAdministrator(user); |
840 | } | 840 | } |
841 | 841 | ||
842 | private bool CanRunScript(LLUUID script, LLUUID objectID, LLUUID user, Scene scene) | 842 | private bool CanRunScript(UUID script, UUID objectID, UUID user, Scene scene) |
843 | { | 843 | { |
844 | DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name); | 844 | DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name); |
845 | if (m_bypassPermissions) return m_bypassPermissionsValue; | 845 | if (m_bypassPermissions) return m_bypassPermissionsValue; |
@@ -847,7 +847,7 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions | |||
847 | return true; | 847 | return true; |
848 | } | 848 | } |
849 | 849 | ||
850 | private bool CanSellParcel(LLUUID user, ILandObject parcel, Scene scene) | 850 | private bool CanSellParcel(UUID user, ILandObject parcel, Scene scene) |
851 | { | 851 | { |
852 | DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name); | 852 | DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name); |
853 | if (m_bypassPermissions) return m_bypassPermissionsValue; | 853 | if (m_bypassPermissions) return m_bypassPermissionsValue; |
@@ -855,7 +855,7 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions | |||
855 | return GenericParcelPermission(user, parcel); | 855 | return GenericParcelPermission(user, parcel); |
856 | } | 856 | } |
857 | 857 | ||
858 | private bool CanTakeObject(LLUUID objectID, LLUUID stealer, Scene scene) | 858 | private bool CanTakeObject(UUID objectID, UUID stealer, Scene scene) |
859 | { | 859 | { |
860 | DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name); | 860 | DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name); |
861 | if (m_bypassPermissions) return m_bypassPermissionsValue; | 861 | if (m_bypassPermissions) return m_bypassPermissionsValue; |
@@ -863,7 +863,7 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions | |||
863 | return GenericObjectPermission(stealer,objectID, false); | 863 | return GenericObjectPermission(stealer,objectID, false); |
864 | } | 864 | } |
865 | 865 | ||
866 | private bool CanTakeCopyObject(LLUUID objectID, LLUUID userID, Scene inScene) | 866 | private bool CanTakeCopyObject(UUID objectID, UUID userID, Scene inScene) |
867 | { | 867 | { |
868 | DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name); | 868 | DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name); |
869 | if (m_bypassPermissions) return m_bypassPermissionsValue; | 869 | if (m_bypassPermissions) return m_bypassPermissionsValue; |
@@ -883,10 +883,10 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions | |||
883 | } | 883 | } |
884 | 884 | ||
885 | SceneObjectGroup task = (SceneObjectGroup)m_scene.Entities[objectID]; | 885 | SceneObjectGroup task = (SceneObjectGroup)m_scene.Entities[objectID]; |
886 | // LLUUID taskOwner = null; | 886 | // UUID taskOwner = null; |
887 | // Added this because at this point in time it wouldn't be wise for | 887 | // Added this because at this point in time it wouldn't be wise for |
888 | // the administrator object permissions to take effect. | 888 | // the administrator object permissions to take effect. |
889 | // LLUUID objectOwner = task.OwnerID; | 889 | // UUID objectOwner = task.OwnerID; |
890 | 890 | ||
891 | 891 | ||
892 | if ((task.RootPart.EveryoneMask & PERM_COPY) != 0) | 892 | if ((task.RootPart.EveryoneMask & PERM_COPY) != 0) |
@@ -895,7 +895,7 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions | |||
895 | return permission; | 895 | return permission; |
896 | } | 896 | } |
897 | 897 | ||
898 | private bool CanTerraformLand(LLUUID user, LLVector3 position, Scene requestFromScene) | 898 | private bool CanTerraformLand(UUID user, Vector3 position, Scene requestFromScene) |
899 | { | 899 | { |
900 | DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name); | 900 | DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name); |
901 | if (m_bypassPermissions) return m_bypassPermissionsValue; | 901 | if (m_bypassPermissions) return m_bypassPermissionsValue; |
@@ -927,7 +927,7 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions | |||
927 | return permission; | 927 | return permission; |
928 | } | 928 | } |
929 | 929 | ||
930 | private bool CanViewScript(LLUUID script, LLUUID objectID, LLUUID user, Scene scene) | 930 | private bool CanViewScript(UUID script, UUID objectID, UUID user, Scene scene) |
931 | { | 931 | { |
932 | DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name); | 932 | DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name); |
933 | if (m_bypassPermissions) return m_bypassPermissionsValue; | 933 | if (m_bypassPermissions) return m_bypassPermissionsValue; |
@@ -935,7 +935,7 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions | |||
935 | return false; | 935 | return false; |
936 | } | 936 | } |
937 | 937 | ||
938 | private bool CanViewNotecard(LLUUID notecard, LLUUID objectID, LLUUID user, Scene scene) | 938 | private bool CanViewNotecard(UUID notecard, UUID objectID, UUID user, Scene scene) |
939 | { | 939 | { |
940 | DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name); | 940 | DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name); |
941 | if (m_bypassPermissions) return m_bypassPermissionsValue; | 941 | if (m_bypassPermissions) return m_bypassPermissionsValue; |
@@ -945,7 +945,7 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions | |||
945 | 945 | ||
946 | #endregion | 946 | #endregion |
947 | 947 | ||
948 | public bool CanLinkObject(LLUUID userID, LLUUID objectID) | 948 | public bool CanLinkObject(UUID userID, UUID objectID) |
949 | { | 949 | { |
950 | DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name); | 950 | DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name); |
951 | if (m_bypassPermissions) return m_bypassPermissionsValue; | 951 | if (m_bypassPermissions) return m_bypassPermissionsValue; |
@@ -953,7 +953,7 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions | |||
953 | return true; | 953 | return true; |
954 | } | 954 | } |
955 | 955 | ||
956 | public bool CanDelinkObject(LLUUID userID, LLUUID objectID) | 956 | public bool CanDelinkObject(UUID userID, UUID objectID) |
957 | { | 957 | { |
958 | DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name); | 958 | DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name); |
959 | if (m_bypassPermissions) return m_bypassPermissionsValue; | 959 | if (m_bypassPermissions) return m_bypassPermissionsValue; |
@@ -961,7 +961,7 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions | |||
961 | return true; | 961 | return true; |
962 | } | 962 | } |
963 | 963 | ||
964 | public bool CanBuyLand(LLUUID userID, ILandObject parcel, Scene scene) | 964 | public bool CanBuyLand(UUID userID, ILandObject parcel, Scene scene) |
965 | { | 965 | { |
966 | DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name); | 966 | DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name); |
967 | if (m_bypassPermissions) return m_bypassPermissionsValue; | 967 | if (m_bypassPermissions) return m_bypassPermissionsValue; |
@@ -969,7 +969,7 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions | |||
969 | return true; | 969 | return true; |
970 | } | 970 | } |
971 | 971 | ||
972 | public bool CanCopyInventory(LLUUID itemID, LLUUID objectID, LLUUID userID) | 972 | public bool CanCopyInventory(UUID itemID, UUID objectID, UUID userID) |
973 | { | 973 | { |
974 | DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name); | 974 | DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name); |
975 | if (m_bypassPermissions) return m_bypassPermissionsValue; | 975 | if (m_bypassPermissions) return m_bypassPermissionsValue; |
@@ -977,7 +977,7 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions | |||
977 | return true; | 977 | return true; |
978 | } | 978 | } |
979 | 979 | ||
980 | public bool CanDeleteInventory(LLUUID itemID, LLUUID objectID, LLUUID userID) | 980 | public bool CanDeleteInventory(UUID itemID, UUID objectID, UUID userID) |
981 | { | 981 | { |
982 | DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name); | 982 | DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name); |
983 | if (m_bypassPermissions) return m_bypassPermissionsValue; | 983 | if (m_bypassPermissions) return m_bypassPermissionsValue; |
@@ -985,7 +985,7 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions | |||
985 | return true; | 985 | return true; |
986 | } | 986 | } |
987 | 987 | ||
988 | public bool CanCreateInventory(uint invType, LLUUID objectID, LLUUID userID) | 988 | public bool CanCreateInventory(uint invType, UUID objectID, UUID userID) |
989 | { | 989 | { |
990 | DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name); | 990 | DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name); |
991 | if (m_bypassPermissions) return m_bypassPermissionsValue; | 991 | if (m_bypassPermissions) return m_bypassPermissionsValue; |
@@ -993,7 +993,7 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions | |||
993 | return true; | 993 | return true; |
994 | } | 994 | } |
995 | 995 | ||
996 | public bool CanTeleport(LLUUID userID) | 996 | public bool CanTeleport(UUID userID) |
997 | { | 997 | { |
998 | DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name); | 998 | DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name); |
999 | if (m_bypassPermissions) return m_bypassPermissionsValue; | 999 | if (m_bypassPermissions) return m_bypassPermissionsValue; |