aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/CoreModules/Asset/CoreAssetCache.cs3
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectors/Asset/HGAssetBroker.cs2
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectors/Asset/LocalAssetServiceConnector.cs2
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectors/Asset/RemoteAssetServiceConnector.cs2
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectors/User/LocalUserServiceConnector.cs2
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectors/User/RemoteUserServiceConnector.cs2
-rw-r--r--OpenSim/Services/AssetService/HGAssetService.cs15
-rw-r--r--OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs4
8 files changed, 19 insertions, 13 deletions
diff --git a/OpenSim/Region/CoreModules/Asset/CoreAssetCache.cs b/OpenSim/Region/CoreModules/Asset/CoreAssetCache.cs
index bc6a239..cd475bd 100644
--- a/OpenSim/Region/CoreModules/Asset/CoreAssetCache.cs
+++ b/OpenSim/Region/CoreModules/Asset/CoreAssetCache.cs
@@ -56,8 +56,7 @@ namespace OpenSim.Region.CoreModules.Asset
56 56
57 public void Initialise(IConfigSource source) 57 public void Initialise(IConfigSource source)
58 { 58 {
59 IConfig moduleConfig = source.Configs["ServiceConnectors"]; 59 IConfig moduleConfig = source.Configs["Modules"];
60 m_log.DebugFormat("[XXX] moduleConfig null? {0}", ((moduleConfig == null) ? "yes" : "no"));
61 60
62 if (moduleConfig != null) 61 if (moduleConfig != null)
63 { 62 {
diff --git a/OpenSim/Region/CoreModules/ServiceConnectors/Asset/HGAssetBroker.cs b/OpenSim/Region/CoreModules/ServiceConnectors/Asset/HGAssetBroker.cs
index c3a878e..54451fd 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectors/Asset/HGAssetBroker.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectors/Asset/HGAssetBroker.cs
@@ -59,7 +59,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectors.Asset
59 59
60 public void Initialise(IConfigSource source) 60 public void Initialise(IConfigSource source)
61 { 61 {
62 IConfig moduleConfig = source.Configs["ServiceConnectors"]; 62 IConfig moduleConfig = source.Configs["Modules"];
63 if (moduleConfig != null) 63 if (moduleConfig != null)
64 { 64 {
65 string name = moduleConfig.GetString("AssetServices", ""); 65 string name = moduleConfig.GetString("AssetServices", "");
diff --git a/OpenSim/Region/CoreModules/ServiceConnectors/Asset/LocalAssetServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectors/Asset/LocalAssetServiceConnector.cs
index 11c857f..19a41ec 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectors/Asset/LocalAssetServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectors/Asset/LocalAssetServiceConnector.cs
@@ -58,7 +58,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectors.Asset
58 58
59 public void Initialise(IConfigSource source) 59 public void Initialise(IConfigSource source)
60 { 60 {
61 IConfig moduleConfig = source.Configs["ServiceConnectors"]; 61 IConfig moduleConfig = source.Configs["Modules"];
62 if (moduleConfig != null) 62 if (moduleConfig != null)
63 { 63 {
64 string name = moduleConfig.GetString("AssetServices", ""); 64 string name = moduleConfig.GetString("AssetServices", "");
diff --git a/OpenSim/Region/CoreModules/ServiceConnectors/Asset/RemoteAssetServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectors/Asset/RemoteAssetServiceConnector.cs
index 5bbd181..ec982e5 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectors/Asset/RemoteAssetServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectors/Asset/RemoteAssetServiceConnector.cs
@@ -55,7 +55,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectors.Asset
55 55
56 public override void Initialise(IConfigSource source) 56 public override void Initialise(IConfigSource source)
57 { 57 {
58 IConfig moduleConfig = source.Configs["ServiceConnectors"]; 58 IConfig moduleConfig = source.Configs["Modules"];
59 if (moduleConfig != null) 59 if (moduleConfig != null)
60 { 60 {
61 string name = moduleConfig.GetString("AssetServices", ""); 61 string name = moduleConfig.GetString("AssetServices", "");
diff --git a/OpenSim/Region/CoreModules/ServiceConnectors/User/LocalUserServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectors/User/LocalUserServiceConnector.cs
index c34ade9..37286bd 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectors/User/LocalUserServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectors/User/LocalUserServiceConnector.cs
@@ -53,7 +53,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectors.User
53 53
54 public void Initialise(IConfigSource source) 54 public void Initialise(IConfigSource source)
55 { 55 {
56 IConfig moduleConfig = source.Configs["ServiceConnectors"]; 56 IConfig moduleConfig = source.Configs["Modules"];
57 if (moduleConfig != null) 57 if (moduleConfig != null)
58 { 58 {
59 string name = moduleConfig.GetString("UserServices", ""); 59 string name = moduleConfig.GetString("UserServices", "");
diff --git a/OpenSim/Region/CoreModules/ServiceConnectors/User/RemoteUserServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectors/User/RemoteUserServiceConnector.cs
index fcfc4fa..e56aac5 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectors/User/RemoteUserServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectors/User/RemoteUserServiceConnector.cs
@@ -43,7 +43,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectors.User
43 43
44 public void Initialise(IConfigSource source) 44 public void Initialise(IConfigSource source)
45 { 45 {
46 IConfig moduleConfig = source.Configs["ServiceConnectors"]; 46 IConfig moduleConfig = source.Configs["Modules"];
47 if (moduleConfig != null) 47 if (moduleConfig != null)
48 { 48 {
49 string name = moduleConfig.GetString("UserServices", ""); 49 string name = moduleConfig.GetString("UserServices", "");
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
diff --git a/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs b/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs
index 5eb8e0f..258c444 100644
--- a/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs
+++ b/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs
@@ -127,9 +127,9 @@ namespace OpenSim.Tests.Common.Setup
127 127
128 ISharedRegionModule assetService = new LocalAssetServicesConnector(); 128 ISharedRegionModule assetService = new LocalAssetServicesConnector();
129 IniConfigSource config = new IniConfigSource(); 129 IniConfigSource config = new IniConfigSource();
130 config.AddConfig("ServiceConnectors"); 130 config.AddConfig("Modules");
131 config.AddConfig("AssetService"); 131 config.AddConfig("AssetService");
132 config.Configs["ServiceConnectors"].Set("AssetServices", "LocalAssetServicesConnector"); 132 config.Configs["Modules"].Set("AssetServices", "LocalAssetServicesConnector");
133 config.Configs["AssetService"].Set("LocalServiceModule", "OpenSim.Services.AssetService.dll:AssetService"); 133 config.Configs["AssetService"].Set("LocalServiceModule", "OpenSim.Services.AssetService.dll:AssetService");
134 config.Configs["AssetService"].Set("StorageProvider", "OpenSim.Data.Null.dll"); 134 config.Configs["AssetService"].Set("StorageProvider", "OpenSim.Data.Null.dll");
135 assetService.Initialise(config); 135 assetService.Initialise(config);