From 720e2bc5d9c0d28f5bd5a1d3ec07edda809bdef5 Mon Sep 17 00:00:00 2001 From: diva Date: Sun, 17 May 2009 15:37:50 +0000 Subject: Renaming [ServiceConnectors] back to [Modules]. --- OpenSim/Services/AssetService/HGAssetService.cs | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) (limited to 'OpenSim/Services/AssetService/HGAssetService.cs') diff --git a/OpenSim/Services/AssetService/HGAssetService.cs b/OpenSim/Services/AssetService/HGAssetService.cs index 0b6389f..195c69f 100644 --- a/OpenSim/Services/AssetService/HGAssetService.cs +++ b/OpenSim/Services/AssetService/HGAssetService.cs @@ -46,7 +46,7 @@ namespace OpenSim.Services.AssetService public HGAssetService(IConfigSource source) { - IConfig moduleConfig = source.Configs["ServiceConnectors"]; + IConfig moduleConfig = source.Configs["Modules"]; if (moduleConfig != null) { string name = moduleConfig.GetString("AssetServices", ""); @@ -95,9 +95,7 @@ namespace OpenSim.Services.AssetService // work in general, because the remote grid may be running // an asset server that has a different protocol. // Eventually we will want a piece of meta-protocol asking - // the remote server about its kind, and even asking it - // to send its own connector, which we would instantiate - // dynamically. Definitely coo, thing to do! + // the remote server about its kind. Definitely cool thing to do! connector = new AssetServicesConnector(url); m_connectors.Add(url, connector); } @@ -121,6 +119,15 @@ namespace OpenSim.Services.AssetService public AssetMetadata GetMetadata(string id) { + string url = string.Empty; + string assetID = string.Empty; + + if (StringToUrlAndAssetID(id, out url, out assetID)) + { + IAssetService connector = GetConnector(url); + return connector.GetMetadata(assetID); + } + return null; } -- cgit v1.1