OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Thank you kindly, Diva, for a patch that: 

Removed unnecessary dependency from 
Get/PostAssetHandlers to OpenAsset_Main
0.6.0-stable
Charles Krinke 2008-11-06 19:24:42 +00:00
parent c8db23d456
commit 557c7de2ec
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Grid/AssetServer/Main.cs
View File

@ -102,8 +102,8 @@ namespace OpenSim.Grid.AssetServer
protected void AddHttpHandlers() protected void AddHttpHandlers()
{ {
m_httpServer.AddStreamHandler(new GetAssetStreamHandler(this, m_assetProvider)); m_httpServer.AddStreamHandler(new GetAssetStreamHandler(m_assetProvider));
m_httpServer.AddStreamHandler(new PostAssetStreamHandler(this, m_assetProvider)); m_httpServer.AddStreamHandler(new PostAssetStreamHandler(m_assetProvider));
} }
public byte[] GetAssetData(UUID assetID, bool isTexture) public byte[] GetAssetData(UUID assetID, bool isTexture)

4
OpenSim/Grid/AssetServer/RestService.cs
View File

@ -52,7 +52,7 @@ namespace OpenSim.Grid.AssetServer
/// </summary> /// </summary>
/// <param name="assetManager"></param> /// <param name="assetManager"></param>
/// <param name="assetProvider"></param> /// <param name="assetProvider"></param>
public GetAssetStreamHandler(OpenAsset_Main assetManager, IAssetProviderPlugin assetProvider) public GetAssetStreamHandler(IAssetProviderPlugin assetProvider)
: base("GET", "/assets") : base("GET", "/assets")
{ {
m_log.Info("[REST]: In Get Request"); m_log.Info("[REST]: In Get Request");
@ -142,7 +142,7 @@ namespace OpenSim.Grid.AssetServer
return new byte[] {}; return new byte[] {};
} }
public PostAssetStreamHandler(OpenAsset_Main assetManager, IAssetProviderPlugin assetProvider) public PostAssetStreamHandler(IAssetProviderPlugin assetProvider)
: base("POST", "/assets") : base("POST", "/assets")
{ {
// m_assetManager = assetManager; // m_assetManager = assetManager;