aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Modules/World/Permissions
diff options
context:
space:
mode:
authorDr Scofield2008-06-27 19:57:06 +0000
committerDr Scofield2008-06-27 19:57:06 +0000
commit3d26e6ede04389252332d9ba25016155ee607411 (patch)
tree4acc6c6c89458ecab162de1afe3a1918928de348 /OpenSim/Region/Environment/Modules/World/Permissions
parentrun NArrange on SOP to stack together the attributes, (diff)
downloadopensim-SC_OLD-3d26e6ede04389252332d9ba25016155ee607411.zip
opensim-SC_OLD-3d26e6ede04389252332d9ba25016155ee607411.tar.gz
opensim-SC_OLD-3d26e6ede04389252332d9ba25016155ee607411.tar.bz2
opensim-SC_OLD-3d26e6ede04389252332d9ba25016155ee607411.tar.xz
move along, nothing to see here. just a couple of lazy variables.
Diffstat (limited to 'OpenSim/Region/Environment/Modules/World/Permissions')
-rw-r--r--OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs10
1 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs b/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs
index e8defb7..d6ee739 100644
--- a/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs
+++ b/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs
@@ -310,7 +310,7 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions
310 objectOwnerMask |= (uint)LLObject.ObjectFlags.ObjectYouOwner | (uint)LLObject.ObjectFlags.ObjectOwnerModify; 310 objectOwnerMask |= (uint)LLObject.ObjectFlags.ObjectYouOwner | (uint)LLObject.ObjectFlags.ObjectOwnerModify;
311 311
312 // Customize the GroupMask 312 // Customize the GroupMask
313 uint objectGroupMask = ApplyObjectModifyMasks(task.GroupMask, objflags); 313 // uint objectGroupMask = ApplyObjectModifyMasks(task.GroupMask, objflags);
314 314
315 // Customize the EveryoneMask 315 // Customize the EveryoneMask
316 uint objectEveryoneMask = ApplyObjectModifyMasks(task.EveryoneMask, objflags); 316 uint objectEveryoneMask = ApplyObjectModifyMasks(task.EveryoneMask, objflags);
@@ -655,10 +655,10 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions
655 SceneObjectGroup task = (SceneObjectGroup)m_scene.Entities[objectID]; 655 SceneObjectGroup task = (SceneObjectGroup)m_scene.Entities[objectID];
656 656
657 657
658 LLUUID taskOwner = null; 658 // LLUUID taskOwner = null;
659 // Added this because at this point in time it wouldn't be wise for 659 // Added this because at this point in time it wouldn't be wise for
660 // the administrator object permissions to take effect. 660 // the administrator object permissions to take effect.
661 LLUUID objectOwner = task.OwnerID; 661 // LLUUID objectOwner = task.OwnerID;
662 662
663 // Anyone can move 663 // Anyone can move
664 if ((task.RootPart.EveryoneMask & PERM_MOVE) != 0) 664 if ((task.RootPart.EveryoneMask & PERM_MOVE) != 0)
@@ -842,10 +842,10 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions
842 } 842 }
843 843
844 SceneObjectGroup task = (SceneObjectGroup)m_scene.Entities[objectID]; 844 SceneObjectGroup task = (SceneObjectGroup)m_scene.Entities[objectID];
845 LLUUID taskOwner = null; 845 // LLUUID taskOwner = null;
846 // Added this because at this point in time it wouldn't be wise for 846 // Added this because at this point in time it wouldn't be wise for
847 // the administrator object permissions to take effect. 847 // the administrator object permissions to take effect.
848 LLUUID objectOwner = task.OwnerID; 848 // LLUUID objectOwner = task.OwnerID;
849 849
850 850
851 if ((task.RootPart.EveryoneMask & PERM_COPY) != 0) 851 if ((task.RootPart.EveryoneMask & PERM_COPY) != 0)