diff options
author | Mike Mazur | 2008-07-31 09:24:28 +0000 |
---|---|---|
committer | Mike Mazur | 2008-07-31 09:24:28 +0000 |
commit | 2270b252656146d9d74b84665a7ace6c3139db30 (patch) | |
tree | 7a967ee50349cf4301ed801e0b8c85f5060ffe1d /OpenSim/Grid/AssetServer/RestService.cs | |
parent | dropping intermediate GridInfoPlugin.addin.xml, as it's no longer (diff) | |
download | opensim-SC-2270b252656146d9d74b84665a7ace6c3139db30.zip opensim-SC-2270b252656146d9d74b84665a7ace6c3139db30.tar.gz opensim-SC-2270b252656146d9d74b84665a7ace6c3139db30.tar.bz2 opensim-SC-2270b252656146d9d74b84665a7ace6c3139db30.tar.xz |
Thanks, sempuki, for a patch that moves all Grid Server's plugins to
PluginLoader. Fix issue 1871.
Diffstat (limited to 'OpenSim/Grid/AssetServer/RestService.cs')
-rw-r--r-- | OpenSim/Grid/AssetServer/RestService.cs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Grid/AssetServer/RestService.cs b/OpenSim/Grid/AssetServer/RestService.cs index 372f5f8..f63b78b 100644 --- a/OpenSim/Grid/AssetServer/RestService.cs +++ b/OpenSim/Grid/AssetServer/RestService.cs | |||
@@ -45,14 +45,14 @@ namespace OpenSim.Grid.AssetServer | |||
45 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 45 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
46 | 46 | ||
47 | // private OpenAsset_Main m_assetManager; | 47 | // private OpenAsset_Main m_assetManager; |
48 | private IAssetProvider m_assetProvider; | 48 | private IAssetProviderPlugin m_assetProvider; |
49 | 49 | ||
50 | /// <summary> | 50 | /// <summary> |
51 | /// Constructor. | 51 | /// Constructor. |
52 | /// </summary> | 52 | /// </summary> |
53 | /// <param name="assetManager"></param> | 53 | /// <param name="assetManager"></param> |
54 | /// <param name="assetProvider"></param> | 54 | /// <param name="assetProvider"></param> |
55 | public GetAssetStreamHandler(OpenAsset_Main assetManager, IAssetProvider assetProvider) | 55 | public GetAssetStreamHandler(OpenAsset_Main assetManager, IAssetProviderPlugin assetProvider) |
56 | : base("GET", "/assets") | 56 | : base("GET", "/assets") |
57 | { | 57 | { |
58 | m_log.Info("[REST]: In Get Request"); | 58 | m_log.Info("[REST]: In Get Request"); |
@@ -121,7 +121,7 @@ namespace OpenSim.Grid.AssetServer | |||
121 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 121 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
122 | 122 | ||
123 | // private OpenAsset_Main m_assetManager; | 123 | // private OpenAsset_Main m_assetManager; |
124 | private IAssetProvider m_assetProvider; | 124 | private IAssetProviderPlugin m_assetProvider; |
125 | 125 | ||
126 | public override byte[] Handle(string path, Stream request, | 126 | public override byte[] Handle(string path, Stream request, |
127 | OSHttpRequest httpRequest, OSHttpResponse httpResponse) | 127 | OSHttpRequest httpRequest, OSHttpResponse httpResponse) |
@@ -142,7 +142,7 @@ namespace OpenSim.Grid.AssetServer | |||
142 | return new byte[] {}; | 142 | return new byte[] {}; |
143 | } | 143 | } |
144 | 144 | ||
145 | public PostAssetStreamHandler(OpenAsset_Main assetManager, IAssetProvider assetProvider) | 145 | public PostAssetStreamHandler(OpenAsset_Main assetManager, IAssetProviderPlugin assetProvider) |
146 | : base("POST", "/assets") | 146 | : base("POST", "/assets") |
147 | { | 147 | { |
148 | // m_assetManager = assetManager; | 148 | // m_assetManager = assetManager; |