From 211266513324288001a42e809e7b5934b1c30fa4 Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Sun, 2 Oct 2022 11:40:29 +0100 Subject: [PATCH] http cookies are gone --- .../Framework/Serialization/ArchiveConstants.cs | 2 ++ .../HttpServer/Interfaces/IOSHttpRequest.cs | 1 - .../Framework/Servers/HttpServer/OSHttpRequest.cs | 15 --------------- 3 files changed, 2 insertions(+), 16 deletions(-) diff --git a/OpenSim/Framework/Serialization/ArchiveConstants.cs b/OpenSim/Framework/Serialization/ArchiveConstants.cs index d3557a714e..de41a8b256 100644 --- a/OpenSim/Framework/Serialization/ArchiveConstants.cs +++ b/OpenSim/Framework/Serialization/ArchiveConstants.cs @@ -126,6 +126,7 @@ namespace OpenSim.Framework.Serialization ASSET_TYPE_TO_EXTENSION[(sbyte)AssetType.Texture] = ASSET_EXTENSION_SEPARATOR + "texture.jp2"; ASSET_TYPE_TO_EXTENSION[(sbyte)AssetType.TextureTGA] = ASSET_EXTENSION_SEPARATOR + "texture.tga"; ASSET_TYPE_TO_EXTENSION[(sbyte)OpenSimAssetType.Material] = ASSET_EXTENSION_SEPARATOR + "material.xml"; + ASSET_TYPE_TO_EXTENSION[(sbyte)AssetType.Material] = ASSET_EXTENSION_SEPARATOR + "prmat.dat"; ASSET_TYPE_TO_EXTENSION[(sbyte)AssetType.Settings] = ASSET_EXTENSION_SEPARATOR + "settings.bin"; EXTENSION_TO_ASSET_TYPE[ASSET_EXTENSION_SEPARATOR + "animation.bvh"] = (sbyte)AssetType.Animation; @@ -149,6 +150,7 @@ namespace OpenSim.Framework.Serialization EXTENSION_TO_ASSET_TYPE[ASSET_EXTENSION_SEPARATOR + "texture.tga"] = (sbyte)AssetType.TextureTGA; EXTENSION_TO_ASSET_TYPE[ASSET_EXTENSION_SEPARATOR + "material.xml"] = (sbyte)OpenSimAssetType.Material; EXTENSION_TO_ASSET_TYPE[ASSET_EXTENSION_SEPARATOR + "settings.bin"] = (sbyte)AssetType.Settings; + EXTENSION_TO_ASSET_TYPE[ASSET_EXTENSION_SEPARATOR + "prmat.dat"] = (sbyte)AssetType.Material; } public static string CreateOarLandDataPath(LandData ld) diff --git a/OpenSim/Framework/Servers/HttpServer/Interfaces/IOSHttpRequest.cs b/OpenSim/Framework/Servers/HttpServer/Interfaces/IOSHttpRequest.cs index 62558f2b57..2f75276b98 100644 --- a/OpenSim/Framework/Servers/HttpServer/Interfaces/IOSHttpRequest.cs +++ b/OpenSim/Framework/Servers/HttpServer/Interfaces/IOSHttpRequest.cs @@ -43,7 +43,6 @@ namespace OpenSim.Framework.Servers.HttpServer long ContentLength { get; } long ContentLength64 { get; } string ContentType { get; } - HttpCookieCollection Cookies { get; } bool HasEntityBody { get; } NameValueCollection Headers { get; } string HttpMethod { get; } diff --git a/OpenSim/Framework/Servers/HttpServer/OSHttpRequest.cs b/OpenSim/Framework/Servers/HttpServer/OSHttpRequest.cs index f3487d8b9a..49b728400a 100644 --- a/OpenSim/Framework/Servers/HttpServer/OSHttpRequest.cs +++ b/OpenSim/Framework/Servers/HttpServer/OSHttpRequest.cs @@ -73,21 +73,6 @@ namespace OpenSim.Framework.Servers.HttpServer } private string m_contentType; - public HttpCookieCollection Cookies - { - get - { - RequestCookies cookies = m_request.Cookies; - HttpCookieCollection httpCookies = new HttpCookieCollection(); - if(cookies != null) - { - foreach (RequestCookie cookie in cookies) - httpCookies.Add(new HttpCookie(cookie.Name, cookie.Value)); - } - return httpCookies; - } - } - public bool HasEntityBody { get { return m_request.ContentLength != 0; }