From 557c7de2ec5074c254dd61611e3e937d7b55f16d Mon Sep 17 00:00:00 2001
From: Charles Krinke
Date: Thu, 6 Nov 2008 19:24:42 +0000
Subject: Thank you kindly, Diva, for a patch that: Removed unnecessary
 dependency from Get/PostAssetHandlers to OpenAsset_Main

---
 OpenSim/Grid/AssetServer/Main.cs        | 4 ++--
 OpenSim/Grid/AssetServer/RestService.cs | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'OpenSim/Grid/AssetServer')

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
 
         protected void AddHttpHandlers()
         {
-            m_httpServer.AddStreamHandler(new GetAssetStreamHandler(this, m_assetProvider));
-            m_httpServer.AddStreamHandler(new PostAssetStreamHandler(this, m_assetProvider));
+            m_httpServer.AddStreamHandler(new GetAssetStreamHandler(m_assetProvider));
+            m_httpServer.AddStreamHandler(new PostAssetStreamHandler(m_assetProvider));
         }
 
         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
         /// </summary>
         /// <param name="assetManager"></param>
         /// <param name="assetProvider"></param>
-        public GetAssetStreamHandler(OpenAsset_Main assetManager, IAssetProviderPlugin assetProvider)
+        public GetAssetStreamHandler(IAssetProviderPlugin assetProvider)
             : base("GET", "/assets")
         {
             m_log.Info("[REST]: In Get Request");
@@ -142,7 +142,7 @@ namespace OpenSim.Grid.AssetServer
             return new byte[] {};
         }
 
-        public PostAssetStreamHandler(OpenAsset_Main assetManager, IAssetProviderPlugin assetProvider)
+        public PostAssetStreamHandler(IAssetProviderPlugin assetProvider)
             : base("POST", "/assets")
         {
             // m_assetManager = assetManager;
-- 
cgit v1.1