aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.Inventory.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.Inventory.cs11
1 files changed, 6 insertions, 5 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index 17159b4..18ea865 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -687,7 +687,7 @@ namespace OpenSim.Region.Framework.Scenes
687 /// <summary> 687 /// <summary>
688 /// Create a new asset data structure. 688 /// Create a new asset data structure.
689 /// </summary> 689 /// </summary>
690 private AssetBase CreateAsset(string name, string description, sbyte assetType, byte[] data, UUID creatorID) 690 public AssetBase CreateAsset(string name, string description, sbyte assetType, byte[] data, UUID creatorID)
691 { 691 {
692 AssetBase asset = new AssetBase(UUID.Random(), name, assetType, creatorID.ToString()); 692 AssetBase asset = new AssetBase(UUID.Random(), name, assetType, creatorID.ToString());
693 asset.Description = description; 693 asset.Description = description;
@@ -869,7 +869,7 @@ namespace OpenSim.Region.Framework.Scenes
869 ScenePresence presence; 869 ScenePresence presence;
870 if (TryGetScenePresence(remoteClient.AgentId, out presence)) 870 if (TryGetScenePresence(remoteClient.AgentId, out presence))
871 { 871 {
872 byte[] data = null; 872// byte[] data = null;
873 873
874 AssetBase asset = new AssetBase(); 874 AssetBase asset = new AssetBase();
875 asset.FullID = olditemID; 875 asset.FullID = olditemID;
@@ -877,8 +877,10 @@ namespace OpenSim.Region.Framework.Scenes
877 asset.Name = name; 877 asset.Name = name;
878 asset.Description = description; 878 asset.Description = description;
879 879
880 CreateNewInventoryItem(remoteClient, remoteClient.AgentId.ToString(), folderID, name, 0, callbackID, asset, invType, (uint)PermissionMask.All, (uint)PermissionMask.All, (uint)PermissionMask.All, (uint)PermissionMask.All, (uint)PermissionMask.All, Util.UnixTimeSinceEpoch()); 880 CreateNewInventoryItem(
881 881 remoteClient, remoteClient.AgentId.ToString(), folderID, name, 0, callbackID, asset, invType,
882 (uint)PermissionMask.All, (uint)PermissionMask.All, (uint)PermissionMask.All,
883 (uint)PermissionMask.All, (uint)PermissionMask.All, Util.UnixTimeSinceEpoch());
882 } 884 }
883 else 885 else
884 { 886 {
@@ -911,7 +913,6 @@ namespace OpenSim.Region.Framework.Scenes
911 InventoryService.DeleteFolders(remoteClient.AgentId, folderIDs); 913 InventoryService.DeleteFolders(remoteClient.AgentId, folderIDs);
912 } 914 }
913 915
914
915 /// <summary> 916 /// <summary>
916 /// Send the details of a prim's inventory to the client. 917 /// Send the details of a prim's inventory to the client.
917 /// </summary> 918 /// </summary>