From 0609970f2e30615ffa38c0ddc852ffb9bfd1c47e Mon Sep 17 00:00:00 2001 From: Justin Clarke Casey Date: Thu, 27 Mar 2008 18:26:01 +0000 Subject: * Correct asset type of Lost and Found folder - this might stop it appearing twice * Other minor corrections to initial inventory contents * These will only take affect for new users --- .../Communications/InventoryServiceBase.cs | 40 +++++++++++----------- OpenSim/Framework/Servers/RestObjectPoster.cs | 3 ++ .../Framework/Servers/RestObjectPosterResponse.cs | 3 ++ 3 files changed, 26 insertions(+), 20 deletions(-) (limited to 'OpenSim/Framework') diff --git a/OpenSim/Framework/Communications/InventoryServiceBase.cs b/OpenSim/Framework/Communications/InventoryServiceBase.cs index c73d45c..b73340c 100644 --- a/OpenSim/Framework/Communications/InventoryServiceBase.cs +++ b/OpenSim/Framework/Communications/InventoryServiceBase.cs @@ -255,7 +255,7 @@ namespace OpenSim.Framework.Communications folder.agentID = user; folder.folderID = LLUUID.Random(); folder.name = "My Inventory"; - folder.type = 8; + folder.type = (short)AssetType.Folder; folder.version = 1; Folders.Add(folder.folderID, folder); @@ -265,8 +265,8 @@ namespace OpenSim.Framework.Communications folder.parentID = rootFolder; folder.agentID = user; folder.folderID = LLUUID.Random(); - folder.name = "Accessories"; - folder.type = 8; + folder.name = "Animations"; + folder.type = (short)AssetType.Animation; folder.version = 1; Folders.Add(folder.folderID, folder); @@ -274,26 +274,26 @@ namespace OpenSim.Framework.Communications folder.parentID = rootFolder; folder.agentID = user; folder.folderID = LLUUID.Random(); - folder.name = "Animations"; - folder.type = 20; + folder.name = "Body Parts"; + folder.type = (short)AssetType.Bodypart; folder.version = 1; Folders.Add(folder.folderID, folder); - + folder = new InventoryFolderBase(); folder.parentID = rootFolder; folder.agentID = user; folder.folderID = LLUUID.Random(); - folder.name = "BodyParts"; - folder.type = 13; + folder.name = "Calling Cards"; + folder.type = (short)AssetType.CallingCard; folder.version = 1; - Folders.Add(folder.folderID, folder); + Folders.Add(folder.folderID, folder); folder = new InventoryFolderBase(); folder.parentID = rootFolder; folder.agentID = user; folder.folderID = LLUUID.Random(); folder.name = "Clothing"; - folder.type = 5; + folder.type = (short)AssetType.Clothing; folder.version = 1; Folders.Add(folder.folderID, folder); @@ -302,7 +302,7 @@ namespace OpenSim.Framework.Communications folder.agentID = user; folder.folderID = LLUUID.Random(); folder.name = "Gestures"; - folder.type = 21; + folder.type = (short)AssetType.Gesture; folder.version = 1; Folders.Add(folder.folderID, folder); @@ -311,7 +311,7 @@ namespace OpenSim.Framework.Communications folder.agentID = user; folder.folderID = LLUUID.Random(); folder.name = "Landmarks"; - folder.type = 3; + folder.type = (short)AssetType.Landmark; folder.version = 1; Folders.Add(folder.folderID, folder); @@ -320,7 +320,7 @@ namespace OpenSim.Framework.Communications folder.agentID = user; folder.folderID = LLUUID.Random(); folder.name = "Lost And Found"; - folder.type = 3; + folder.type = (short)AssetType.LostAndFoundFolder; folder.version = 1; Folders.Add(folder.folderID, folder); @@ -329,7 +329,7 @@ namespace OpenSim.Framework.Communications folder.agentID = user; folder.folderID = LLUUID.Random(); folder.name = "Notecards"; - folder.type = 7; + folder.type = (short)AssetType.Notecard; folder.version = 1; Folders.Add(folder.folderID, folder); @@ -338,7 +338,7 @@ namespace OpenSim.Framework.Communications folder.agentID = user; folder.folderID = LLUUID.Random(); folder.name = "Objects"; - folder.type = 6; + folder.type = (short)AssetType.Primitive; folder.version = 1; Folders.Add(folder.folderID, folder); @@ -347,7 +347,7 @@ namespace OpenSim.Framework.Communications folder.agentID = user; folder.folderID = LLUUID.Random(); folder.name = "Photo Album"; - folder.type = 15; + folder.type = (short)AssetType.SnapshotFolder; folder.version = 1; Folders.Add(folder.folderID, folder); @@ -356,7 +356,7 @@ namespace OpenSim.Framework.Communications folder.agentID = user; folder.folderID = LLUUID.Random(); folder.name = "Scripts"; - folder.type = 10; + folder.type = (short)AssetType.LSLText; folder.version = 1; Folders.Add(folder.folderID, folder); @@ -365,7 +365,7 @@ namespace OpenSim.Framework.Communications folder.agentID = user; folder.folderID = LLUUID.Random(); folder.name = "Sounds"; - folder.type = 1; + folder.type = (short)AssetType.Sound; folder.version = 1; Folders.Add(folder.folderID, folder); @@ -374,7 +374,7 @@ namespace OpenSim.Framework.Communications folder.agentID = user; folder.folderID = LLUUID.Random(); folder.name = "Textures"; - folder.type = 0; + folder.type = (short)AssetType.Texture; folder.version = 1; Folders.Add(folder.folderID, folder); @@ -383,7 +383,7 @@ namespace OpenSim.Framework.Communications folder.agentID = user; folder.folderID = LLUUID.Random(); folder.name = "Trash"; - folder.type = 14; + folder.type = (short)AssetType.TrashFolder; folder.version = 1; Folders.Add(folder.folderID, folder); } diff --git a/OpenSim/Framework/Servers/RestObjectPoster.cs b/OpenSim/Framework/Servers/RestObjectPoster.cs index 8cc1154..c77cb26 100644 --- a/OpenSim/Framework/Servers/RestObjectPoster.cs +++ b/OpenSim/Framework/Servers/RestObjectPoster.cs @@ -34,6 +34,9 @@ using System.Xml.Serialization; namespace OpenSim.Framework.Servers { + /// + /// Makes an asynchronous REST request which doesn't require us to do anything with the response. + /// public class RestObjectPoster { public static void BeginPostObject(string requestUrl, TRequest obj) diff --git a/OpenSim/Framework/Servers/RestObjectPosterResponse.cs b/OpenSim/Framework/Servers/RestObjectPosterResponse.cs index e2479dd..1d99a80 100644 --- a/OpenSim/Framework/Servers/RestObjectPosterResponse.cs +++ b/OpenSim/Framework/Servers/RestObjectPosterResponse.cs @@ -36,6 +36,9 @@ namespace OpenSim.Framework.Servers { public delegate void ReturnResponse(T reponse); + /// + /// Makes an asynchronous REST request with a callback to invoke with the response. + /// public class RestObjectPosterResponse { public ReturnResponse ResponseCallback; -- cgit v1.1