From dbee7fcb21a65b8ff7e6143ac7c7bf6a65520540 Mon Sep 17 00:00:00 2001
From: Mike Mazur
Date: Mon, 16 Feb 2009 02:26:09 +0000
Subject: - implement and load NullMetrics module in AssetInventoryServer -
 update AssetBase de/serialization in AssetInventoryServer

---
 .../AssetInventoryServer/AssetInventoryServer.cs   | 42 +---------------------
 1 file changed, 1 insertion(+), 41 deletions(-)

(limited to 'OpenSim/Grid/AssetInventoryServer/AssetInventoryServer.cs')

diff --git a/OpenSim/Grid/AssetInventoryServer/AssetInventoryServer.cs b/OpenSim/Grid/AssetInventoryServer/AssetInventoryServer.cs
index 8d71f72..d37c63d 100644
--- a/OpenSim/Grid/AssetInventoryServer/AssetInventoryServer.cs
+++ b/OpenSim/Grid/AssetInventoryServer/AssetInventoryServer.cs
@@ -106,41 +106,8 @@ namespace OpenSim.Grid.AssetInventoryServer
                 return false;
             }
 
-            //try
-            //{
-            //    // Create a reference list for C# extensions compiled at runtime
-            //    List<string> references = new List<string>();
-            //    references.Add("OpenMetaverseTypes.dll");
-            //    references.Add("OpenMetaverse.dll");
-            //    references.Add("OpenMetaverse.StructuredData.dll");
-            //    references.Add("OpenMetaverse.Http.dll");
-            //    references.Add("ExtensionLoader.dll");
-            //    references.Add("AssetServer.exe");
-
-            //    // Get a list of all of the members of AssetServer that are interfaces
-            //    List<FieldInfo> assignables = ExtensionLoader<AssetServer>.GetInterfaces(this);
-
-            //    // Load all of the extensions
-            //    ExtensionLoader<AssetServer>.LoadAllExtensions(
-            //        Assembly.GetExecutingAssembly(),
-            //        Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location),
-            //        extensionList,
-            //        references,
-            //        "AssetServer.*.dll",
-            //        "AssetServer.*.cs",
-            //        this,
-            //        assignables);
-            //}
-            //catch (ExtensionException ex)
-            //{
-            //    Logger.Log.Error("Interface loading failed, shutting down: " + ex.Message);
-            //    if (ex.InnerException != null)
-            //        Logger.Log.Error(ex.InnerException.Message, ex.InnerException);
-            //    Stop();
-            //    return false;
-            //}
-
             StorageProvider = LoadAssetInventoryServerPlugin("/OpenSim/AssetInventoryServer/StorageProvider") as IAssetStorageProvider;
+            MetricsProvider = LoadAssetInventoryServerPlugin("/OpenSim/AssetInventoryServer/MetricsProvider") as IMetricsProvider;
 
             try
             {
@@ -155,13 +122,6 @@ namespace OpenSim.Grid.AssetInventoryServer
 
             frontend = LoadAssetInventoryServerPlugin("/OpenSim/AssetInventoryServer/Frontend");
 
-            // Start all of the extensions
-            //foreach (IExtension<AssetServer> extension in ExtensionLoader<AssetServer>.Extensions)
-            //{
-            //    Logger.Log.Info("Starting extension " + extension.GetType().Name);
-            //    extension.Start(this);
-            //}
-
             return true;
         }
 
-- 
cgit v1.1