diff options
Diffstat (limited to 'OpenSim/Region/CoreModules')
-rw-r--r-- | OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs index 54b422b..8b5b1a7 100644 --- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs +++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs | |||
@@ -789,6 +789,12 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess | |||
789 | { | 789 | { |
790 | group = objlist[i]; | 790 | group = objlist[i]; |
791 | 791 | ||
792 | // m_log.DebugFormat( | ||
793 | // "[InventoryAccessModule]: Preparing to rez {0} {1} {2} ownermask={3:X} nextownermask={4:X} groupmask={5:X} everyonemask={6:X} for {7}", | ||
794 | // group.Name, group.LocalId, group.UUID, | ||
795 | // group.RootPart.OwnerMask, group.RootPart.NextOwnerMask, group.RootPart.GroupMask, group.RootPart.EveryoneMask, | ||
796 | // remoteClient.Name); | ||
797 | |||
792 | // Vector3 storedPosition = group.AbsolutePosition; | 798 | // Vector3 storedPosition = group.AbsolutePosition; |
793 | if (group.UUID == UUID.Zero) | 799 | if (group.UUID == UUID.Zero) |
794 | { | 800 | { |
@@ -854,9 +860,11 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess | |||
854 | rootPart.ScheduleFullUpdate(); | 860 | rootPart.ScheduleFullUpdate(); |
855 | } | 861 | } |
856 | 862 | ||
857 | // m_log.DebugFormat( | 863 | // m_log.DebugFormat( |
858 | // "[InventoryAccessModule]: Rezzed {0} {1} {2} for {3}", | 864 | // "[InventoryAccessModule]: Rezzed {0} {1} {2} ownermask={3:X} nextownermask={4:X} groupmask={5:X} everyonemask={6:X} for {7}", |
859 | // group.Name, group.LocalId, group.UUID, remoteClient.Name); | 865 | // group.Name, group.LocalId, group.UUID, |
866 | // group.RootPart.OwnerMask, group.RootPart.NextOwnerMask, group.RootPart.GroupMask, group.RootPart.EveryoneMask, | ||
867 | // remoteClient.Name); | ||
860 | } | 868 | } |
861 | 869 | ||
862 | if (item != null) | 870 | if (item != null) |
@@ -937,7 +945,10 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess | |||
937 | } | 945 | } |
938 | 946 | ||
939 | rootPart.FromFolderID = item.Folder; | 947 | rootPart.FromFolderID = item.Folder; |
940 | 948 | ||
949 | // Console.WriteLine("rootPart.OwnedID {0}, item.Owner {1}, item.CurrentPermissions {2:X}", | ||
950 | // rootPart.OwnerID, item.Owner, item.CurrentPermissions); | ||
951 | |||
941 | if ((rootPart.OwnerID != item.Owner) || | 952 | if ((rootPart.OwnerID != item.Owner) || |
942 | (item.CurrentPermissions & 16) != 0) | 953 | (item.CurrentPermissions & 16) != 0) |
943 | { | 954 | { |