From 650b051cdfda8c902a72b7a24cfa17aec9c62c7f Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Tue, 31 Mar 2020 22:03:43 +0100 Subject: [PATCH] httpserver send now has priority, use it --- OpenSim/Capabilities/Handlers/GetAssets/GetAssetsHandler.cs | 3 +++ .../Handlers/GetDisplayNames/GetDisplayNamesHandler.cs | 1 + .../Handlers/GetDisplayNames/GetDisplayNamesServerConnector.cs | 1 + 3 files changed, 5 insertions(+) diff --git a/OpenSim/Capabilities/Handlers/GetAssets/GetAssetsHandler.cs b/OpenSim/Capabilities/Handlers/GetAssets/GetAssetsHandler.cs index faac9dc0b9..66fc54e0bb 100644 --- a/OpenSim/Capabilities/Handlers/GetAssets/GetAssetsHandler.cs +++ b/OpenSim/Capabilities/Handlers/GetAssets/GetAssetsHandler.cs @@ -138,7 +138,10 @@ namespace OpenSim.Capabilities.Handlers } if (type == AssetType.Mesh || type == AssetType.Texture) + { responsedata["throttle"] = true; + responsedata["prio"] = 2; + } responsedata["content_type"] = asset.Metadata.ContentType; responsedata["bin_response_data"] = asset.Data; diff --git a/OpenSim/Capabilities/Handlers/GetDisplayNames/GetDisplayNamesHandler.cs b/OpenSim/Capabilities/Handlers/GetDisplayNames/GetDisplayNamesHandler.cs index 199eef1438..ba2c19031e 100644 --- a/OpenSim/Capabilities/Handlers/GetDisplayNames/GetDisplayNamesHandler.cs +++ b/OpenSim/Capabilities/Handlers/GetDisplayNames/GetDisplayNamesHandler.cs @@ -36,6 +36,7 @@ using log4net; using Nini.Config; using OpenMetaverse; using OpenMetaverse.StructuredData; +using OpenSim.Framework; using OpenSim.Framework.Servers.HttpServer; using OpenSim.Services.Interfaces; using Caps = OpenSim.Framework.Capabilities.Caps; diff --git a/OpenSim/Capabilities/Handlers/GetDisplayNames/GetDisplayNamesServerConnector.cs b/OpenSim/Capabilities/Handlers/GetDisplayNames/GetDisplayNamesServerConnector.cs index 32da1c2b09..d9d8634ee5 100644 --- a/OpenSim/Capabilities/Handlers/GetDisplayNames/GetDisplayNamesServerConnector.cs +++ b/OpenSim/Capabilities/Handlers/GetDisplayNames/GetDisplayNamesServerConnector.cs @@ -29,6 +29,7 @@ using System; using Nini.Config; using OpenSim.Server.Base; using OpenSim.Services.Interfaces; +using OpenSim.Framework; using OpenSim.Framework.Servers.HttpServer; using OpenSim.Server.Handlers.Base; using OpenMetaverse;