diff options
author | onefang | 2019-05-19 21:24:15 +1000 |
---|---|---|
committer | onefang | 2019-05-19 21:24:15 +1000 |
commit | 5e4d6cab00cb29cd088ab7b62ab13aff103b64cb (patch) | |
tree | a9fbc62df9eb2d1d9ba2698d8552eae71eca20d8 /OpenSim/Server/Handlers/Asset/AssetServerGetHandler.cs | |
parent | Add a build script. (diff) | |
download | opensim-SC-5e4d6cab00cb29cd088ab7b62ab13aff103b64cb.zip opensim-SC-5e4d6cab00cb29cd088ab7b62ab13aff103b64cb.tar.gz opensim-SC-5e4d6cab00cb29cd088ab7b62ab13aff103b64cb.tar.bz2 opensim-SC-5e4d6cab00cb29cd088ab7b62ab13aff103b64cb.tar.xz |
Dump OpenSim 0.9.0.1 into it's own branch.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Server/Handlers/Asset/AssetServerGetHandler.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Server/Handlers/Asset/AssetServerGetHandler.cs b/OpenSim/Server/Handlers/Asset/AssetServerGetHandler.cs index 91c5c54..8bfc690 100644 --- a/OpenSim/Server/Handlers/Asset/AssetServerGetHandler.cs +++ b/OpenSim/Server/Handlers/Asset/AssetServerGetHandler.cs | |||
@@ -53,7 +53,7 @@ namespace OpenSim.Server.Handlers.Asset | |||
53 | public AssetServerGetHandler(IAssetService service) : | 53 | public AssetServerGetHandler(IAssetService service) : |
54 | base("GET", "/assets") | 54 | base("GET", "/assets") |
55 | { | 55 | { |
56 | m_AssetService = service; | 56 | m_AssetService = service; |
57 | } | 57 | } |
58 | 58 | ||
59 | public AssetServerGetHandler(IAssetService service, IServiceAuth auth, string redirectURL) : | 59 | public AssetServerGetHandler(IAssetService service, IServiceAuth auth, string redirectURL) : |
@@ -155,7 +155,7 @@ namespace OpenSim.Server.Handlers.Asset | |||
155 | httpResponse.ContentType = "text/plain"; | 155 | httpResponse.ContentType = "text/plain"; |
156 | result = new byte[0]; | 156 | result = new byte[0]; |
157 | } | 157 | } |
158 | 158 | ||
159 | if (httpResponse.StatusCode == (int)HttpStatusCode.NotFound && !string.IsNullOrEmpty(m_RedirectURL) && !string.IsNullOrEmpty(id)) | 159 | if (httpResponse.StatusCode == (int)HttpStatusCode.NotFound && !string.IsNullOrEmpty(m_RedirectURL) && !string.IsNullOrEmpty(id)) |
160 | { | 160 | { |
161 | httpResponse.StatusCode = (int)HttpStatusCode.Redirect; | 161 | httpResponse.StatusCode = (int)HttpStatusCode.Redirect; |