aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorCharles Krinke2008-11-06 19:24:42 +0000
committerCharles Krinke2008-11-06 19:24:42 +0000
commit557c7de2ec5074c254dd61611e3e937d7b55f16d (patch)
tree27470c9f39a833e3f4329da8969c0e404499ad2b
parentThank you kindly, Diva for a patch that: (diff)
downloadopensim-SC-557c7de2ec5074c254dd61611e3e937d7b55f16d.zip
opensim-SC-557c7de2ec5074c254dd61611e3e937d7b55f16d.tar.gz
opensim-SC-557c7de2ec5074c254dd61611e3e937d7b55f16d.tar.bz2
opensim-SC-557c7de2ec5074c254dd61611e3e937d7b55f16d.tar.xz
Thank you kindly, Diva, for a patch that:
Removed unnecessary dependency from Get/PostAssetHandlers to OpenAsset_Main
Diffstat (limited to '')
-rw-r--r--OpenSim/Grid/AssetServer/Main.cs4
-rw-r--r--OpenSim/Grid/AssetServer/RestService.cs4
2 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Grid/AssetServer/Main.cs b/OpenSim/Grid/AssetServer/Main.cs
index 1c9275b..6d1028b 100644
--- a/OpenSim/Grid/AssetServer/Main.cs
+++ b/OpenSim/Grid/AssetServer/Main.cs
@@ -102,8 +102,8 @@ namespace OpenSim.Grid.AssetServer
102 102
103 protected void AddHttpHandlers() 103 protected void AddHttpHandlers()
104 { 104 {
105 m_httpServer.AddStreamHandler(new GetAssetStreamHandler(this, m_assetProvider)); 105 m_httpServer.AddStreamHandler(new GetAssetStreamHandler(m_assetProvider));
106 m_httpServer.AddStreamHandler(new PostAssetStreamHandler(this, m_assetProvider)); 106 m_httpServer.AddStreamHandler(new PostAssetStreamHandler(m_assetProvider));
107 } 107 }
108 108
109 public byte[] GetAssetData(UUID assetID, bool isTexture) 109 public byte[] GetAssetData(UUID assetID, bool isTexture)
diff --git a/OpenSim/Grid/AssetServer/RestService.cs b/OpenSim/Grid/AssetServer/RestService.cs
index e805001..8200f11 100644
--- a/OpenSim/Grid/AssetServer/RestService.cs
+++ b/OpenSim/Grid/AssetServer/RestService.cs
@@ -52,7 +52,7 @@ namespace OpenSim.Grid.AssetServer
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, IAssetProviderPlugin assetProvider) 55 public GetAssetStreamHandler(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");
@@ -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, IAssetProviderPlugin assetProvider) 145 public PostAssetStreamHandler(IAssetProviderPlugin assetProvider)
146 : base("POST", "/assets") 146 : base("POST", "/assets")
147 { 147 {
148 // m_assetManager = assetManager; 148 // m_assetManager = assetManager;