diff options
author | UbitUmarov | 2017-01-27 12:32:01 +0000 |
---|---|---|
committer | UbitUmarov | 2017-01-27 12:32:01 +0000 |
commit | 56e3aaefde72bc8819dfb34b423f4ada65f1a195 (patch) | |
tree | f125f1f4f9fb38eb7a053078a7ed5a798c5be0db /OpenSim/Region/Framework/Scenes/Scene.Permissions.cs | |
parent | remove unused and wrong methods (diff) | |
download | opensim-SC-56e3aaefde72bc8819dfb34b423f4ada65f1a195.zip opensim-SC-56e3aaefde72bc8819dfb34b423f4ada65f1a195.tar.gz opensim-SC-56e3aaefde72bc8819dfb34b423f4ada65f1a195.tar.bz2 opensim-SC-56e3aaefde72bc8819dfb34b423f4ada65f1a195.tar.xz |
Permissions modules where made NONShared modules. Make them so, removing incoerences and their potencial bugs
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.Permissions.cs | 120 |
1 files changed, 60 insertions, 60 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Permissions.cs b/OpenSim/Region/Framework/Scenes/Scene.Permissions.cs index 4630497..45d710a 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.Permissions.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.Permissions.cs | |||
@@ -41,47 +41,47 @@ namespace OpenSim.Region.Framework.Scenes | |||
41 | public delegate void SetBypassPermissionsHandler(bool value); | 41 | public delegate void SetBypassPermissionsHandler(bool value); |
42 | public delegate bool BypassPermissionsHandler(); | 42 | public delegate bool BypassPermissionsHandler(); |
43 | public delegate bool PropagatePermissionsHandler(); | 43 | public delegate bool PropagatePermissionsHandler(); |
44 | public delegate bool RezObjectHandler(int objectCount, UUID owner, Vector3 objectPosition, Scene scene); | 44 | public delegate bool RezObjectHandler(int objectCount, UUID owner, Vector3 objectPosition); |
45 | public delegate bool DeleteObjectHandlerByIDs(UUID objectID, UUID deleter, Scene scene); | 45 | public delegate bool DeleteObjectHandlerByIDs(UUID objectID, UUID deleter); |
46 | public delegate bool DeleteObjectHandler(SceneObjectGroup sog, ScenePresence sp); | 46 | public delegate bool DeleteObjectHandler(SceneObjectGroup sog, ScenePresence sp); |
47 | public delegate bool TransferObjectHandler(UUID objectID, UUID recipient, Scene scene); | 47 | public delegate bool TransferObjectHandler(UUID objectID, UUID recipient); |
48 | public delegate bool TakeObjectHandler(SceneObjectGroup sog, ScenePresence sp); | 48 | public delegate bool TakeObjectHandler(SceneObjectGroup sog, ScenePresence sp); |
49 | public delegate bool SellGroupObjectHandler(UUID userID, UUID groupID, Scene scene); | 49 | public delegate bool SellGroupObjectHandler(UUID userID, UUID groupID); |
50 | public delegate bool TakeCopyObjectHandler(SceneObjectGroup sog, ScenePresence sp); | 50 | public delegate bool TakeCopyObjectHandler(SceneObjectGroup sog, ScenePresence sp); |
51 | public delegate bool DuplicateObjectHandler(SceneObjectGroup sog, ScenePresence sp, Scene scenen); | 51 | public delegate bool DuplicateObjectHandler(SceneObjectGroup sog, ScenePresence sp); |
52 | public delegate bool EditObjectByIDsHandler(UUID objectID, UUID editorID, Scene scene); | 52 | public delegate bool EditObjectByIDsHandler(UUID objectID, UUID editorID); |
53 | public delegate bool EditObjectHandler(SceneObjectGroup sog, ScenePresence sp); | 53 | public delegate bool EditObjectHandler(SceneObjectGroup sog, ScenePresence sp); |
54 | public delegate bool EditObjectInventoryHandler(UUID objectID, UUID editorID, Scene scene); | 54 | public delegate bool EditObjectInventoryHandler(UUID objectID, UUID editorID); |
55 | public delegate bool MoveObjectHandler(SceneObjectGroup sog, ScenePresence sp); | 55 | public delegate bool MoveObjectHandler(SceneObjectGroup sog, ScenePresence sp); |
56 | public delegate bool ObjectEntryHandler(SceneObjectGroup sog, bool enteringRegion, Vector3 newPoint, Scene scene); | 56 | public delegate bool ObjectEntryHandler(SceneObjectGroup sog, bool enteringRegion, Vector3 newPoint); |
57 | public delegate bool ReturnObjectsHandler(ILandObject land, UUID user, List<SceneObjectGroup> objects, Scene scene); | 57 | public delegate bool ReturnObjectsHandler(ILandObject land, UUID user, List<SceneObjectGroup> objects); |
58 | public delegate bool InstantMessageHandler(UUID user, UUID target, Scene startScene); | 58 | public delegate bool InstantMessageHandler(UUID user, UUID target); |
59 | public delegate bool InventoryTransferHandler(UUID user, UUID target, Scene startScene); | 59 | public delegate bool InventoryTransferHandler(UUID user, UUID target); |
60 | public delegate bool ViewScriptHandler(UUID script, UUID objectID, UUID user, Scene scene); | 60 | public delegate bool ViewScriptHandler(UUID script, UUID objectID, UUID user); |
61 | public delegate bool ViewNotecardHandler(UUID script, UUID objectID, UUID user, Scene scene); | 61 | public delegate bool ViewNotecardHandler(UUID script, UUID objectID, UUID user); |
62 | public delegate bool EditScriptHandler(UUID script, UUID objectID, UUID user, Scene scene); | 62 | public delegate bool EditScriptHandler(UUID script, UUID objectID, UUID user); |
63 | public delegate bool EditNotecardHandler(UUID notecard, UUID objectID, UUID user, Scene scene); | 63 | public delegate bool EditNotecardHandler(UUID notecard, UUID objectID, UUID user); |
64 | public delegate bool RunScriptHandlerByIDs(UUID script, UUID objectID, UUID user, Scene scene); | 64 | public delegate bool RunScriptHandlerByIDs(UUID script, UUID objectID, UUID user); |
65 | public delegate bool RunScriptHandler(TaskInventoryItem item, SceneObjectPart part); | 65 | public delegate bool RunScriptHandler(TaskInventoryItem item, SceneObjectPart part); |
66 | public delegate bool CompileScriptHandler(UUID ownerUUID, int scriptType, Scene scene); | 66 | public delegate bool CompileScriptHandler(UUID ownerUUID, int scriptType); |
67 | public delegate bool StartScriptHandler(UUID script, UUID user, Scene scene); | 67 | public delegate bool StartScriptHandler(UUID script, UUID user); |
68 | public delegate bool StopScriptHandler(UUID script, UUID user, Scene scene); | 68 | public delegate bool StopScriptHandler(UUID script, UUID user); |
69 | public delegate bool ResetScriptHandler(UUID prim, UUID script, UUID user, Scene scene); | 69 | public delegate bool ResetScriptHandler(UUID prim, UUID script, UUID user); |
70 | public delegate bool TerraformLandHandler(UUID user, Vector3 position, Scene requestFromScene); | 70 | public delegate bool TerraformLandHandler(UUID user, Vector3 position); |
71 | public delegate bool RunConsoleCommandHandler(UUID user, Scene requestFromScene); | 71 | public delegate bool RunConsoleCommandHandler(UUID user); |
72 | public delegate bool IssueEstateCommandHandler(UUID user, Scene requestFromScene, bool ownerCommand); | 72 | public delegate bool IssueEstateCommandHandler(UUID user, bool ownerCommand); |
73 | public delegate bool IsGodHandler(UUID user); | 73 | public delegate bool IsGodHandler(UUID user); |
74 | public delegate bool IsGridGodHandler(UUID user); | 74 | public delegate bool IsGridGodHandler(UUID user); |
75 | public delegate bool IsAdministratorHandler(UUID user); | 75 | public delegate bool IsAdministratorHandler(UUID user); |
76 | public delegate bool IsEstateManagerHandler(UUID user); | 76 | public delegate bool IsEstateManagerHandler(UUID user); |
77 | public delegate bool EditParcelHandler(UUID user, ILandObject parcel, Scene scene); | 77 | public delegate bool EditParcelHandler(UUID user, ILandObject parcel); |
78 | public delegate bool EditParcelPropertiesHandler(UUID user, ILandObject parcel, GroupPowers p, Scene scene, bool allowManager); | 78 | public delegate bool EditParcelPropertiesHandler(UUID user, ILandObject parcel, GroupPowers p, bool allowManager); |
79 | public delegate bool SellParcelHandler(UUID user, ILandObject parcel, Scene scene); | 79 | public delegate bool SellParcelHandler(UUID user, ILandObject parcel); |
80 | public delegate bool AbandonParcelHandler(UUID user, ILandObject parcel, Scene scene); | 80 | public delegate bool AbandonParcelHandler(UUID user, ILandObject parcel); |
81 | public delegate bool ReclaimParcelHandler(UUID user, ILandObject parcel, Scene scene); | 81 | public delegate bool ReclaimParcelHandler(UUID user, ILandObject parcel); |
82 | public delegate bool DeedParcelHandler(UUID user, ILandObject parcel, Scene scene); | 82 | public delegate bool DeedParcelHandler(UUID user, ILandObject parcel); |
83 | public delegate bool DeedObjectHandler(ScenePresence sp, SceneObjectGroup sog, UUID targetGroupID); | 83 | public delegate bool DeedObjectHandler(ScenePresence sp, SceneObjectGroup sog, UUID targetGroupID); |
84 | public delegate bool BuyLandHandler(UUID user, ILandObject parcel, Scene scene); | 84 | public delegate bool BuyLandHandler(UUID user, ILandObject parcel); |
85 | public delegate bool LinkObjectHandler(UUID user, UUID objectID); | 85 | public delegate bool LinkObjectHandler(UUID user, UUID objectID); |
86 | public delegate bool DelinkObjectHandler(UUID user, UUID objectID); | 86 | public delegate bool DelinkObjectHandler(UUID user, UUID objectID); |
87 | public delegate bool CreateObjectInventoryHandler(int invType, UUID objectID, UUID userID); | 87 | public delegate bool CreateObjectInventoryHandler(int invType, UUID objectID, UUID userID); |
@@ -254,7 +254,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
254 | Delegate[] list = handler.GetInvocationList(); | 254 | Delegate[] list = handler.GetInvocationList(); |
255 | foreach (RezObjectHandler h in list) | 255 | foreach (RezObjectHandler h in list) |
256 | { | 256 | { |
257 | if (h(objectCount, owner,objectPosition, m_scene) == false) | 257 | if (h(objectCount, owner,objectPosition) == false) |
258 | return false; | 258 | return false; |
259 | } | 259 | } |
260 | } | 260 | } |
@@ -274,7 +274,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
274 | Delegate[] list = handler.GetInvocationList(); | 274 | Delegate[] list = handler.GetInvocationList(); |
275 | foreach (DeleteObjectHandlerByIDs h in list) | 275 | foreach (DeleteObjectHandlerByIDs h in list) |
276 | { | 276 | { |
277 | if (h(objectID, deleter, m_scene) == false) | 277 | if (h(objectID, deleter) == false) |
278 | { | 278 | { |
279 | result = false; | 279 | result = false; |
280 | break; | 280 | break; |
@@ -321,7 +321,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
321 | Delegate[] list = handler.GetInvocationList(); | 321 | Delegate[] list = handler.GetInvocationList(); |
322 | foreach (TransferObjectHandler h in list) | 322 | foreach (TransferObjectHandler h in list) |
323 | { | 323 | { |
324 | if (h(objectID, recipient, m_scene) == false) | 324 | if (h(objectID, recipient) == false) |
325 | { | 325 | { |
326 | result = false; | 326 | result = false; |
327 | break; | 327 | break; |
@@ -366,7 +366,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
366 | #endregion | 366 | #endregion |
367 | 367 | ||
368 | #region SELL GROUP OBJECT | 368 | #region SELL GROUP OBJECT |
369 | public bool CanSellGroupObject(UUID userID, UUID groupID, Scene scene) | 369 | public bool CanSellGroupObject(UUID userID, UUID groupID) |
370 | { | 370 | { |
371 | bool result = true; | 371 | bool result = true; |
372 | 372 | ||
@@ -376,7 +376,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
376 | Delegate[] list = handler.GetInvocationList(); | 376 | Delegate[] list = handler.GetInvocationList(); |
377 | foreach (SellGroupObjectHandler h in list) | 377 | foreach (SellGroupObjectHandler h in list) |
378 | { | 378 | { |
379 | if (h(userID, groupID, scene) == false) | 379 | if (h(userID, groupID) == false) |
380 | { | 380 | { |
381 | result = false; | 381 | result = false; |
382 | break; | 382 | break; |
@@ -438,7 +438,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
438 | Delegate[] list = handler.GetInvocationList(); | 438 | Delegate[] list = handler.GetInvocationList(); |
439 | foreach (DuplicateObjectHandler h in list) | 439 | foreach (DuplicateObjectHandler h in list) |
440 | { | 440 | { |
441 | if (h(sog, sp, m_scene) == false) | 441 | if (h(sog, sp) == false) |
442 | return false; | 442 | return false; |
443 | } | 443 | } |
444 | } | 444 | } |
@@ -470,7 +470,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
470 | Delegate[] list = handler.GetInvocationList(); | 470 | Delegate[] list = handler.GetInvocationList(); |
471 | foreach (EditObjectByIDsHandler h in list) | 471 | foreach (EditObjectByIDsHandler h in list) |
472 | { | 472 | { |
473 | if (h(objectID, editorID, m_scene) == false) | 473 | if (h(objectID, editorID) == false) |
474 | return false; | 474 | return false; |
475 | } | 475 | } |
476 | } | 476 | } |
@@ -505,7 +505,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
505 | Delegate[] list = handler.GetInvocationList(); | 505 | Delegate[] list = handler.GetInvocationList(); |
506 | foreach (EditObjectInventoryHandler h in list) | 506 | foreach (EditObjectInventoryHandler h in list) |
507 | { | 507 | { |
508 | if (h(objectID, editorID, m_scene) == false) | 508 | if (h(objectID, editorID) == false) |
509 | return false; | 509 | return false; |
510 | } | 510 | } |
511 | } | 511 | } |
@@ -546,7 +546,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
546 | Delegate[] list = handler.GetInvocationList(); | 546 | Delegate[] list = handler.GetInvocationList(); |
547 | foreach (ObjectEntryHandler h in list) | 547 | foreach (ObjectEntryHandler h in list) |
548 | { | 548 | { |
549 | if (h(sog, enteringRegion, newPoint, m_scene) == false) | 549 | if (h(sog, enteringRegion, newPoint) == false) |
550 | return false; | 550 | return false; |
551 | } | 551 | } |
552 | } | 552 | } |
@@ -566,7 +566,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
566 | Delegate[] list = handler.GetInvocationList(); | 566 | Delegate[] list = handler.GetInvocationList(); |
567 | foreach (ReturnObjectsHandler h in list) | 567 | foreach (ReturnObjectsHandler h in list) |
568 | { | 568 | { |
569 | if (h(land, user, objects, m_scene) == false) | 569 | if (h(land, user, objects) == false) |
570 | { | 570 | { |
571 | result = false; | 571 | result = false; |
572 | break; | 572 | break; |
@@ -592,7 +592,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
592 | Delegate[] list = handler.GetInvocationList(); | 592 | Delegate[] list = handler.GetInvocationList(); |
593 | foreach (InstantMessageHandler h in list) | 593 | foreach (InstantMessageHandler h in list) |
594 | { | 594 | { |
595 | if (h(user, target, m_scene) == false) | 595 | if (h(user, target) == false) |
596 | return false; | 596 | return false; |
597 | } | 597 | } |
598 | } | 598 | } |
@@ -610,7 +610,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
610 | Delegate[] list = handler.GetInvocationList(); | 610 | Delegate[] list = handler.GetInvocationList(); |
611 | foreach (InventoryTransferHandler h in list) | 611 | foreach (InventoryTransferHandler h in list) |
612 | { | 612 | { |
613 | if (h(user, target, m_scene) == false) | 613 | if (h(user, target) == false) |
614 | return false; | 614 | return false; |
615 | } | 615 | } |
616 | } | 616 | } |
@@ -628,7 +628,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
628 | Delegate[] list = handler.GetInvocationList(); | 628 | Delegate[] list = handler.GetInvocationList(); |
629 | foreach (ViewScriptHandler h in list) | 629 | foreach (ViewScriptHandler h in list) |
630 | { | 630 | { |
631 | if (h(script, objectID, user, m_scene) == false) | 631 | if (h(script, objectID, user) == false) |
632 | return false; | 632 | return false; |
633 | } | 633 | } |
634 | } | 634 | } |
@@ -643,7 +643,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
643 | Delegate[] list = handler.GetInvocationList(); | 643 | Delegate[] list = handler.GetInvocationList(); |
644 | foreach (ViewNotecardHandler h in list) | 644 | foreach (ViewNotecardHandler h in list) |
645 | { | 645 | { |
646 | if (h(script, objectID, user, m_scene) == false) | 646 | if (h(script, objectID, user) == false) |
647 | return false; | 647 | return false; |
648 | } | 648 | } |
649 | } | 649 | } |
@@ -661,7 +661,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
661 | Delegate[] list = handler.GetInvocationList(); | 661 | Delegate[] list = handler.GetInvocationList(); |
662 | foreach (EditScriptHandler h in list) | 662 | foreach (EditScriptHandler h in list) |
663 | { | 663 | { |
664 | if (h(script, objectID, user, m_scene) == false) | 664 | if (h(script, objectID, user) == false) |
665 | return false; | 665 | return false; |
666 | } | 666 | } |
667 | } | 667 | } |
@@ -676,7 +676,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
676 | Delegate[] list = handler.GetInvocationList(); | 676 | Delegate[] list = handler.GetInvocationList(); |
677 | foreach (EditNotecardHandler h in list) | 677 | foreach (EditNotecardHandler h in list) |
678 | { | 678 | { |
679 | if (h(script, objectID, user, m_scene) == false) | 679 | if (h(script, objectID, user) == false) |
680 | return false; | 680 | return false; |
681 | } | 681 | } |
682 | } | 682 | } |
@@ -694,7 +694,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
694 | Delegate[] list = handler.GetInvocationList(); | 694 | Delegate[] list = handler.GetInvocationList(); |
695 | foreach (RunScriptHandlerByIDs h in list) | 695 | foreach (RunScriptHandlerByIDs h in list) |
696 | { | 696 | { |
697 | if (h(script, objectID, user, m_scene) == false) | 697 | if (h(script, objectID, user) == false) |
698 | return false; | 698 | return false; |
699 | } | 699 | } |
700 | } | 700 | } |
@@ -730,7 +730,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
730 | Delegate[] list = handler.GetInvocationList(); | 730 | Delegate[] list = handler.GetInvocationList(); |
731 | foreach (CompileScriptHandler h in list) | 731 | foreach (CompileScriptHandler h in list) |
732 | { | 732 | { |
733 | if (h(ownerUUID, scriptType, m_scene) == false) | 733 | if (h(ownerUUID, scriptType) == false) |
734 | return false; | 734 | return false; |
735 | } | 735 | } |
736 | } | 736 | } |
@@ -748,7 +748,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
748 | Delegate[] list = handler.GetInvocationList(); | 748 | Delegate[] list = handler.GetInvocationList(); |
749 | foreach (StartScriptHandler h in list) | 749 | foreach (StartScriptHandler h in list) |
750 | { | 750 | { |
751 | if (h(script, user, m_scene) == false) | 751 | if (h(script, user) == false) |
752 | return false; | 752 | return false; |
753 | } | 753 | } |
754 | } | 754 | } |
@@ -766,7 +766,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
766 | Delegate[] list = handler.GetInvocationList(); | 766 | Delegate[] list = handler.GetInvocationList(); |
767 | foreach (StopScriptHandler h in list) | 767 | foreach (StopScriptHandler h in list) |
768 | { | 768 | { |
769 | if (h(script, user, m_scene) == false) | 769 | if (h(script, user) == false) |
770 | return false; | 770 | return false; |
771 | } | 771 | } |
772 | } | 772 | } |
@@ -784,7 +784,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
784 | Delegate[] list = handler.GetInvocationList(); | 784 | Delegate[] list = handler.GetInvocationList(); |
785 | foreach (ResetScriptHandler h in list) | 785 | foreach (ResetScriptHandler h in list) |
786 | { | 786 | { |
787 | if (h(prim, script, user, m_scene) == false) | 787 | if (h(prim, script, user) == false) |
788 | return false; | 788 | return false; |
789 | } | 789 | } |
790 | } | 790 | } |
@@ -802,7 +802,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
802 | Delegate[] list = handler.GetInvocationList(); | 802 | Delegate[] list = handler.GetInvocationList(); |
803 | foreach (TerraformLandHandler h in list) | 803 | foreach (TerraformLandHandler h in list) |
804 | { | 804 | { |
805 | if (h(user, pos, m_scene) == false) | 805 | if (h(user, pos) == false) |
806 | return false; | 806 | return false; |
807 | } | 807 | } |
808 | } | 808 | } |
@@ -820,7 +820,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
820 | Delegate[] list = handler.GetInvocationList(); | 820 | Delegate[] list = handler.GetInvocationList(); |
821 | foreach (RunConsoleCommandHandler h in list) | 821 | foreach (RunConsoleCommandHandler h in list) |
822 | { | 822 | { |
823 | if (h(user, m_scene) == false) | 823 | if (h(user) == false) |
824 | return false; | 824 | return false; |
825 | } | 825 | } |
826 | } | 826 | } |
@@ -838,7 +838,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
838 | Delegate[] list = handler.GetInvocationList(); | 838 | Delegate[] list = handler.GetInvocationList(); |
839 | foreach (IssueEstateCommandHandler h in list) | 839 | foreach (IssueEstateCommandHandler h in list) |
840 | { | 840 | { |
841 | if (h(user, m_scene, ownerCommand) == false) | 841 | if (h(user, ownerCommand) == false) |
842 | return false; | 842 | return false; |
843 | } | 843 | } |
844 | } | 844 | } |
@@ -918,7 +918,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
918 | Delegate[] list = handler.GetInvocationList(); | 918 | Delegate[] list = handler.GetInvocationList(); |
919 | foreach (EditParcelPropertiesHandler h in list) | 919 | foreach (EditParcelPropertiesHandler h in list) |
920 | { | 920 | { |
921 | if (h(user, parcel, p, m_scene, allowManager) == false) | 921 | if (h(user, parcel, p, allowManager) == false) |
922 | return false; | 922 | return false; |
923 | } | 923 | } |
924 | } | 924 | } |
@@ -935,7 +935,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
935 | Delegate[] list = handler.GetInvocationList(); | 935 | Delegate[] list = handler.GetInvocationList(); |
936 | foreach (SellParcelHandler h in list) | 936 | foreach (SellParcelHandler h in list) |
937 | { | 937 | { |
938 | if (h(user, parcel, m_scene) == false) | 938 | if (h(user, parcel) == false) |
939 | return false; | 939 | return false; |
940 | } | 940 | } |
941 | } | 941 | } |
@@ -952,7 +952,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
952 | Delegate[] list = handler.GetInvocationList(); | 952 | Delegate[] list = handler.GetInvocationList(); |
953 | foreach (AbandonParcelHandler h in list) | 953 | foreach (AbandonParcelHandler h in list) |
954 | { | 954 | { |
955 | if (h(user, parcel, m_scene) == false) | 955 | if (h(user, parcel) == false) |
956 | return false; | 956 | return false; |
957 | } | 957 | } |
958 | } | 958 | } |
@@ -968,7 +968,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
968 | Delegate[] list = handler.GetInvocationList(); | 968 | Delegate[] list = handler.GetInvocationList(); |
969 | foreach (ReclaimParcelHandler h in list) | 969 | foreach (ReclaimParcelHandler h in list) |
970 | { | 970 | { |
971 | if (h(user, parcel, m_scene) == false) | 971 | if (h(user, parcel) == false) |
972 | return false; | 972 | return false; |
973 | } | 973 | } |
974 | } | 974 | } |
@@ -983,7 +983,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
983 | Delegate[] list = handler.GetInvocationList(); | 983 | Delegate[] list = handler.GetInvocationList(); |
984 | foreach (DeedParcelHandler h in list) | 984 | foreach (DeedParcelHandler h in list) |
985 | { | 985 | { |
986 | if (h(user, parcel, m_scene) == false) | 986 | if (h(user, parcel) == false) |
987 | return false; | 987 | return false; |
988 | } | 988 | } |
989 | } | 989 | } |
@@ -1018,7 +1018,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1018 | Delegate[] list = handler.GetInvocationList(); | 1018 | Delegate[] list = handler.GetInvocationList(); |
1019 | foreach (BuyLandHandler h in list) | 1019 | foreach (BuyLandHandler h in list) |
1020 | { | 1020 | { |
1021 | if (h(user, parcel, m_scene) == false) | 1021 | if (h(user, parcel) == false) |
1022 | return false; | 1022 | return false; |
1023 | } | 1023 | } |
1024 | } | 1024 | } |