diff options
Diffstat (limited to '')
-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 7b5b334..e81cb3f 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 IAssetProviderPlugin m_assetProvider; | 48 | private IAssetDataPlugin 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(IAssetProviderPlugin assetProvider) | 55 | public GetAssetStreamHandler(IAssetDataPlugin 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"); |
@@ -125,7 +125,7 @@ namespace OpenSim.Grid.AssetServer | |||
125 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 125 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
126 | 126 | ||
127 | // private OpenAsset_Main m_assetManager; | 127 | // private OpenAsset_Main m_assetManager; |
128 | private IAssetProviderPlugin m_assetProvider; | 128 | private IAssetDataPlugin m_assetProvider; |
129 | 129 | ||
130 | public override byte[] Handle(string path, Stream request, | 130 | public override byte[] Handle(string path, Stream request, |
131 | OSHttpRequest httpRequest, OSHttpResponse httpResponse) | 131 | OSHttpRequest httpRequest, OSHttpResponse httpResponse) |
@@ -146,7 +146,7 @@ namespace OpenSim.Grid.AssetServer | |||
146 | return new byte[] {}; | 146 | return new byte[] {}; |
147 | } | 147 | } |
148 | 148 | ||
149 | public PostAssetStreamHandler(IAssetProviderPlugin assetProvider) | 149 | public PostAssetStreamHandler(IAssetDataPlugin assetProvider) |
150 | : base("POST", "/assets") | 150 | : base("POST", "/assets") |
151 | { | 151 | { |
152 | // m_assetManager = assetManager; | 152 | // m_assetManager = assetManager; |