diff options
author | Diva Canto | 2012-03-27 10:08:13 -0700 |
---|---|---|
committer | Diva Canto | 2012-03-27 10:08:13 -0700 |
commit | 8131a24cde3f3877b3b8dd850871c57c17b2b216 (patch) | |
tree | c5909ee4f38507d0d48ab98274b1507170325bcd /OpenSim/Services/InventoryService/XInventoryService.cs | |
parent | Add some more overloads to allow registering overloaded methods and lists (diff) | |
download | opensim-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/InventoryService/XInventoryService.cs')
-rw-r--r-- | OpenSim/Services/InventoryService/XInventoryService.cs | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/OpenSim/Services/InventoryService/XInventoryService.cs b/OpenSim/Services/InventoryService/XInventoryService.cs index 1648b51..8c57d17 100644 --- a/OpenSim/Services/InventoryService/XInventoryService.cs +++ b/OpenSim/Services/InventoryService/XInventoryService.cs | |||
@@ -46,9 +46,17 @@ namespace OpenSim.Services.InventoryService | |||
46 | 46 | ||
47 | protected IXInventoryData m_Database; | 47 | protected IXInventoryData m_Database; |
48 | protected bool m_AllowDelete = true; | 48 | protected bool m_AllowDelete = true; |
49 | protected string m_ConfigName = "InventoryService"; | ||
49 | 50 | ||
50 | public XInventoryService(IConfigSource config) : base(config) | 51 | public XInventoryService(IConfigSource config) |
52 | : this(config, "InventoryService") | ||
51 | { | 53 | { |
54 | } | ||
55 | public XInventoryService(IConfigSource config, string configName) : base(config) | ||
56 | { | ||
57 | if (configName != string.Empty) | ||
58 | m_ConfigName = configName; | ||
59 | |||
52 | string dllName = String.Empty; | 60 | string dllName = String.Empty; |
53 | string connString = String.Empty; | 61 | string connString = String.Empty; |
54 | //string realm = "Inventory"; // OSG version doesn't use this | 62 | //string realm = "Inventory"; // OSG version doesn't use this |
@@ -56,7 +64,7 @@ namespace OpenSim.Services.InventoryService | |||
56 | // | 64 | // |
57 | // Try reading the [InventoryService] section first, if it exists | 65 | // Try reading the [InventoryService] section first, if it exists |
58 | // | 66 | // |
59 | IConfig authConfig = config.Configs["InventoryService"]; | 67 | IConfig authConfig = config.Configs[m_ConfigName]; |
60 | if (authConfig != null) | 68 | if (authConfig != null) |
61 | { | 69 | { |
62 | dllName = authConfig.GetString("StorageProvider", dllName); | 70 | dllName = authConfig.GetString("StorageProvider", dllName); |