diff --git a/OpenSim/Framework/Servers/RestDeserialiseHandler.cs b/OpenSim/Framework/Servers/RestDeserialiseHandler.cs index 99358aa51d..5c2dd4aa8b 100644 --- a/OpenSim/Framework/Servers/RestDeserialiseHandler.cs +++ b/OpenSim/Framework/Servers/RestDeserialiseHandler.cs @@ -34,12 +34,12 @@ namespace OpenSim.Framework.Servers { public delegate TResponse RestDeserialiseMethod(TRequest request); - public class RestDeserialisehandler : BaseRequestHandler, IStreamHandler + public class RestDeserialiseHandler : BaseRequestHandler, IStreamHandler where TRequest : new() { private RestDeserialiseMethod m_method; - public RestDeserialisehandler(string httpMethod, string path, RestDeserialiseMethod method) + public RestDeserialiseHandler(string httpMethod, string path, RestDeserialiseMethod method) : base(httpMethod, path) { m_method = method; diff --git a/OpenSim/Grid/InventoryServer/Main.cs b/OpenSim/Grid/InventoryServer/Main.cs index a0688921fe..2ab1916a11 100644 --- a/OpenSim/Grid/InventoryServer/Main.cs +++ b/OpenSim/Grid/InventoryServer/Main.cs @@ -85,35 +85,35 @@ namespace OpenSim.Grid.InventoryServer protected void AddHttpHandlers() { m_httpServer.AddStreamHandler( - new RestDeserialisehandler( + new RestDeserialiseHandler( "POST", "/GetInventory/", m_inventoryService.GetUserInventory)); m_httpServer.AddStreamHandler( - new RestDeserialisehandler( + new RestDeserialiseHandler( "POST", "/CreateInventory/", m_inventoryService.CreateUsersInventory)); m_httpServer.AddStreamHandler( - new RestDeserialisehandler( + new RestDeserialiseHandler( "POST", "/NewFolder/", m_inventoryService.AddFolder)); m_httpServer.AddStreamHandler( - new RestDeserialisehandler( + new RestDeserialiseHandler( "POST", "/UpdateFolder/", m_inventoryService.UpdateFolder)); m_httpServer.AddStreamHandler( - new RestDeserialisehandler( + new RestDeserialiseHandler( "POST", "/MoveFolder/", m_inventoryService.MoveFolder)); m_httpServer.AddStreamHandler( - new RestDeserialisehandler( + new RestDeserialiseHandler( "POST", "/PurgeFolder/", m_inventoryService.PurgeFolder)); m_httpServer.AddStreamHandler( - new RestDeserialisehandler( + new RestDeserialiseHandler( "POST", "/NewItem/", m_inventoryService.AddItem)); m_httpServer.AddStreamHandler( - new RestDeserialisehandler( + new RestDeserialiseHandler( "POST", "/DeleteItem/", m_inventoryService.DeleteItem)); // WARNING: Root folders no longer just delivers the root and immediate child folders (e.g @@ -122,7 +122,7 @@ namespace OpenSim.Grid.InventoryServer // (e.g. any http request not found is automatically treated as an xmlrpc request) make it easier // to do this for now. m_httpServer.AddStreamHandler( - new RestDeserialisehandler> + new RestDeserialiseHandler> ("POST", "/RootFolders/", m_inventoryService.GetInventorySkeleton)); }