diff options
author | Melanie Thielker | 2009-05-09 02:49:55 +0000 |
---|---|---|
committer | Melanie Thielker | 2009-05-09 02:49:55 +0000 |
commit | c1e7352d75b62b6c97e79c4fdb37b9493aba697a (patch) | |
tree | 0bf2e2b12fafc2fc08dce9c50a0fa198b787979c /OpenSim/Servers/Asset/AssetServerGetHandler.cs | |
parent | FInish basic asset server functionality on the new asset server (diff) | |
download | opensim-SC-c1e7352d75b62b6c97e79c4fdb37b9493aba697a.zip opensim-SC-c1e7352d75b62b6c97e79c4fdb37b9493aba697a.tar.gz opensim-SC-c1e7352d75b62b6c97e79c4fdb37b9493aba697a.tar.bz2 opensim-SC-c1e7352d75b62b6c97e79c4fdb37b9493aba697a.tar.xz |
Add the asset service connectors and sample config. READ WARNINGS!!!
Diffstat (limited to 'OpenSim/Servers/Asset/AssetServerGetHandler.cs')
-rw-r--r-- | OpenSim/Servers/Asset/AssetServerGetHandler.cs | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/OpenSim/Servers/Asset/AssetServerGetHandler.cs b/OpenSim/Servers/Asset/AssetServerGetHandler.cs index 1535fb5..935a07c 100644 --- a/OpenSim/Servers/Asset/AssetServerGetHandler.cs +++ b/OpenSim/Servers/Asset/AssetServerGetHandler.cs | |||
@@ -26,8 +26,10 @@ | |||
26 | */ | 26 | */ |
27 | 27 | ||
28 | using Nini.Config; | 28 | using Nini.Config; |
29 | using log4net; | ||
29 | using System; | 30 | using System; |
30 | using System.IO; | 31 | using System.IO; |
32 | using System.Reflection; | ||
31 | using System.Net; | 33 | using System.Net; |
32 | using System.Text; | 34 | using System.Text; |
33 | using System.Text.RegularExpressions; | 35 | using System.Text.RegularExpressions; |
@@ -35,7 +37,6 @@ using System.Xml; | |||
35 | using System.Xml.Serialization; | 37 | using System.Xml.Serialization; |
36 | using OpenSim.Servers.Base; | 38 | using OpenSim.Servers.Base; |
37 | using OpenSim.Services.Interfaces; | 39 | using OpenSim.Services.Interfaces; |
38 | using OpenSim.Services.AssetService; | ||
39 | using OpenSim.Framework; | 40 | using OpenSim.Framework; |
40 | using OpenSim.Framework.Servers.HttpServer; | 41 | using OpenSim.Framework.Servers.HttpServer; |
41 | 42 | ||
@@ -43,6 +44,10 @@ namespace OpenSim.Servers.AssetServer | |||
43 | { | 44 | { |
44 | public class AssetServerGetHandler : BaseStreamHandler | 45 | public class AssetServerGetHandler : BaseStreamHandler |
45 | { | 46 | { |
47 | private static readonly ILog m_log = | ||
48 | LogManager.GetLogger( | ||
49 | MethodBase.GetCurrentMethod().DeclaringType); | ||
50 | |||
46 | private IAssetService m_AssetService; | 51 | private IAssetService m_AssetService; |
47 | 52 | ||
48 | public AssetServerGetHandler(IAssetService service) : | 53 | public AssetServerGetHandler(IAssetService service) : |