diff options
author | diva | 2009-05-17 15:37:50 +0000 |
---|---|---|
committer | diva | 2009-05-17 15:37:50 +0000 |
commit | 720e2bc5d9c0d28f5bd5a1d3ec07edda809bdef5 (patch) | |
tree | 4c20f89df976094f2c4b552e7a34ab6405c60a81 /OpenSim/Services | |
parent | Update svn properties. (diff) | |
download | opensim-SC-720e2bc5d9c0d28f5bd5a1d3ec07edda809bdef5.zip opensim-SC-720e2bc5d9c0d28f5bd5a1d3ec07edda809bdef5.tar.gz opensim-SC-720e2bc5d9c0d28f5bd5a1d3ec07edda809bdef5.tar.bz2 opensim-SC-720e2bc5d9c0d28f5bd5a1d3ec07edda809bdef5.tar.xz |
Renaming [ServiceConnectors] back to [Modules].
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Services/AssetService/HGAssetService.cs | 15 |
1 files changed, 11 insertions, 4 deletions
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 | |||
46 | 46 | ||
47 | public HGAssetService(IConfigSource source) | 47 | public HGAssetService(IConfigSource source) |
48 | { | 48 | { |
49 | IConfig moduleConfig = source.Configs["ServiceConnectors"]; | 49 | IConfig moduleConfig = source.Configs["Modules"]; |
50 | if (moduleConfig != null) | 50 | if (moduleConfig != null) |
51 | { | 51 | { |
52 | string name = moduleConfig.GetString("AssetServices", ""); | 52 | string name = moduleConfig.GetString("AssetServices", ""); |
@@ -95,9 +95,7 @@ namespace OpenSim.Services.AssetService | |||
95 | // work in general, because the remote grid may be running | 95 | // work in general, because the remote grid may be running |
96 | // an asset server that has a different protocol. | 96 | // an asset server that has a different protocol. |
97 | // Eventually we will want a piece of meta-protocol asking | 97 | // Eventually we will want a piece of meta-protocol asking |
98 | // the remote server about its kind, and even asking it | 98 | // the remote server about its kind. Definitely cool thing to do! |
99 | // to send its own connector, which we would instantiate | ||
100 | // dynamically. Definitely coo, thing to do! | ||
101 | connector = new AssetServicesConnector(url); | 99 | connector = new AssetServicesConnector(url); |
102 | m_connectors.Add(url, connector); | 100 | m_connectors.Add(url, connector); |
103 | } | 101 | } |
@@ -121,6 +119,15 @@ namespace OpenSim.Services.AssetService | |||
121 | 119 | ||
122 | public AssetMetadata GetMetadata(string id) | 120 | public AssetMetadata GetMetadata(string id) |
123 | { | 121 | { |
122 | string url = string.Empty; | ||
123 | string assetID = string.Empty; | ||
124 | |||
125 | if (StringToUrlAndAssetID(id, out url, out assetID)) | ||
126 | { | ||
127 | IAssetService connector = GetConnector(url); | ||
128 | return connector.GetMetadata(assetID); | ||
129 | } | ||
130 | |||
124 | return null; | 131 | return null; |
125 | } | 132 | } |
126 | 133 | ||