aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/AssetService/AssetService.cs
diff options
context:
space:
mode:
authorDiva Canto2012-03-27 10:08:13 -0700
committerDiva Canto2012-03-27 10:08:13 -0700
commit8131a24cde3f3877b3b8dd850871c57c17b2b216 (patch)
treec5909ee4f38507d0d48ab98274b1507170325bcd /OpenSim/Services/AssetService/AssetService.cs
parentAdd some more overloads to allow registering overloaded methods and lists (diff)
downloadopensim-SC_OLD-8131a24cde3f3877b3b8dd850871c57c17b2b216.zip
opensim-SC_OLD-8131a24cde3f3877b3b8dd850871c57c17b2b216.tar.gz
opensim-SC_OLD-8131a24cde3f3877b3b8dd850871c57c17b2b216.tar.bz2
opensim-SC_OLD-8131a24cde3f3877b3b8dd850871c57c17b2b216.tar.xz
Send the config section name up to the service classes themselves (XInventory and Assets).
Diffstat (limited to 'OpenSim/Services/AssetService/AssetService.cs')
-rw-r--r--OpenSim/Services/AssetService/AssetService.cs11
1 files changed, 8 insertions, 3 deletions
diff --git a/OpenSim/Services/AssetService/AssetService.cs b/OpenSim/Services/AssetService/AssetService.cs
index 4f4cbf6..137a9b0 100644
--- a/OpenSim/Services/AssetService/AssetService.cs
+++ b/OpenSim/Services/AssetService/AssetService.cs
@@ -46,7 +46,12 @@ namespace OpenSim.Services.AssetService
46 46
47 protected static AssetService m_RootInstance; 47 protected static AssetService m_RootInstance;
48 48
49 public AssetService(IConfigSource config) : base(config) 49 public AssetService(IConfigSource config)
50 : this(config, "AssetService")
51 {
52 }
53
54 public AssetService(IConfigSource config, string configName) : base(config, configName)
50 { 55 {
51 if (m_RootInstance == null) 56 if (m_RootInstance == null)
52 { 57 {
@@ -54,9 +59,9 @@ namespace OpenSim.Services.AssetService
54 59
55 if (m_AssetLoader != null) 60 if (m_AssetLoader != null)
56 { 61 {
57 IConfig assetConfig = config.Configs["AssetService"]; 62 IConfig assetConfig = config.Configs[m_ConfigName];
58 if (assetConfig == null) 63 if (assetConfig == null)
59 throw new Exception("No AssetService configuration"); 64 throw new Exception("No " + m_ConfigName + " configuration");
60 65
61 string loaderArgs = assetConfig.GetString("AssetLoaderArgs", 66 string loaderArgs = assetConfig.GetString("AssetLoaderArgs",
62 String.Empty); 67 String.Empty);