aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Server/Handlers/Asset/AssetServerPostHandler.cs
diff options
context:
space:
mode:
authorJustin Clark-Casey2014-05-27 23:29:54 +0100
committerJustin Clark-Casey2014-05-27 23:29:54 +0100
commit3f703ae1cb02cbcb0efaff061d495bacca941de0 (patch)
tree3221068b4bc4119023b3dfa621c19e126c2eb3f3 /OpenSim/Server/Handlers/Asset/AssetServerPostHandler.cs
parentMerge branch 'master' into 0.8-post-fixes (diff)
parentminor: Comment out 2 error level debugging message in authentication code (diff)
downloadopensim-SC_OLD-3f703ae1cb02cbcb0efaff061d495bacca941de0.zip
opensim-SC_OLD-3f703ae1cb02cbcb0efaff061d495bacca941de0.tar.gz
opensim-SC_OLD-3f703ae1cb02cbcb0efaff061d495bacca941de0.tar.bz2
opensim-SC_OLD-3f703ae1cb02cbcb0efaff061d495bacca941de0.tar.xz
Merge branch 'master' into 0.8-post-fixes
Diffstat (limited to 'OpenSim/Server/Handlers/Asset/AssetServerPostHandler.cs')
-rw-r--r--OpenSim/Server/Handlers/Asset/AssetServerPostHandler.cs7
1 files changed, 7 insertions, 0 deletions
diff --git a/OpenSim/Server/Handlers/Asset/AssetServerPostHandler.cs b/OpenSim/Server/Handlers/Asset/AssetServerPostHandler.cs
index a77e67d..1c706a7 100644
--- a/OpenSim/Server/Handlers/Asset/AssetServerPostHandler.cs
+++ b/OpenSim/Server/Handlers/Asset/AssetServerPostHandler.cs
@@ -38,6 +38,7 @@ using System.Xml.Serialization;
38using OpenSim.Server.Base; 38using OpenSim.Server.Base;
39using OpenSim.Services.Interfaces; 39using OpenSim.Services.Interfaces;
40using OpenSim.Framework; 40using OpenSim.Framework;
41using OpenSim.Framework.ServiceAuth;
41using OpenSim.Framework.Servers.HttpServer; 42using OpenSim.Framework.Servers.HttpServer;
42 43
43namespace OpenSim.Server.Handlers.Asset 44namespace OpenSim.Server.Handlers.Asset
@@ -54,6 +55,12 @@ namespace OpenSim.Server.Handlers.Asset
54 m_AssetService = service; 55 m_AssetService = service;
55 } 56 }
56 57
58 public AssetServerPostHandler(IAssetService service, IServiceAuth auth) :
59 base("POST", "/assets", auth)
60 {
61 m_AssetService = service;
62 }
63
57 protected override byte[] ProcessRequest(string path, Stream request, 64 protected override byte[] ProcessRequest(string path, Stream request,
58 IOSHttpRequest httpRequest, IOSHttpResponse httpResponse) 65 IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
59 { 66 {