aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.Inventory.cs16
1 files changed, 8 insertions, 8 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index 8bd0c0a..55db968 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -40,7 +40,7 @@ using OpenSim.Framework;
40using OpenSim.Region.Framework; 40using OpenSim.Region.Framework;
41using OpenSim.Framework.Client; 41using OpenSim.Framework.Client;
42using OpenSim.Region.Framework.Interfaces; 42using OpenSim.Region.Framework.Interfaces;
43using OpenSim.Region.Framework.Scenes.Serialization; 43using OpenSim.Region.Framework.Scenes.Serialization;
44using OpenSim.Services.Interfaces; 44using OpenSim.Services.Interfaces;
45using PermissionMask = OpenSim.Framework.PermissionMask; 45using PermissionMask = OpenSim.Framework.PermissionMask;
46 46
@@ -127,11 +127,11 @@ namespace OpenSim.Region.Framework.Scenes
127 127
128 return false; 128 return false;
129 } 129 }
130 } 130 }
131 131
132 public bool AddInventoryItem(InventoryItemBase item) 132 public bool AddInventoryItem(InventoryItemBase item)
133 { 133 {
134 return AddInventoryItem(item, true); 134 return AddInventoryItem(item, true);
135 } 135 }
136 136
137 /// <summary> 137 /// <summary>
@@ -1074,7 +1074,7 @@ namespace OpenSim.Region.Framework.Scenes
1074// } 1074// }
1075 1075
1076 CreateNewInventoryItem( 1076 CreateNewInventoryItem(
1077 remoteClient, remoteClient.AgentId.ToString(), string.Empty, folderID, 1077 remoteClient, remoteClient.AgentId.ToString(), string.Empty, folderID,
1078 name, description, 0, callbackID, olditemID, type, invType, 1078 name, description, 0, callbackID, olditemID, type, invType,
1079 (uint)PermissionMask.All | (uint)PermissionMask.Export, (uint)PermissionMask.All | (uint)PermissionMask.Export, (uint)PermissionMask.All, 1079 (uint)PermissionMask.All | (uint)PermissionMask.Export, (uint)PermissionMask.All | (uint)PermissionMask.Export, (uint)PermissionMask.All,
1080 (uint)PermissionMask.All | (uint)PermissionMask.Export, (uint)PermissionMask.All | (uint)PermissionMask.Export, Util.UnixTimeSinceEpoch(), 1080 (uint)PermissionMask.All | (uint)PermissionMask.Export, (uint)PermissionMask.All | (uint)PermissionMask.Export, Util.UnixTimeSinceEpoch(),
@@ -2183,7 +2183,7 @@ namespace OpenSim.Region.Framework.Scenes
2183 } 2183 }
2184 } 2184 }
2185 2185
2186 // OK, we're done with permissions. Let's check if any part of the code prevents the objects from being deleted 2186 // OK, we're done with permissions. Let's check if any part of the code prevents the objects from being deleted
2187 bool canDelete = EventManager.TriggerDeRezRequested(remoteClient, deleteGroups, action); 2187 bool canDelete = EventManager.TriggerDeRezRequested(remoteClient, deleteGroups, action);
2188 2188
2189 if (permissionToTake && (action != DeRezAction.Delete || this.m_useTrashOnDelete)) 2189 if (permissionToTake && (action != DeRezAction.Delete || this.m_useTrashOnDelete))