aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/AssetService/AssetServiceBase.cs
diff options
context:
space:
mode:
authorMelanie Thielker2009-06-22 12:18:04 +0000
committerMelanie Thielker2009-06-22 12:18:04 +0000
commit044446821b7d1d4550e43b0351c2611026874755 (patch)
tree2043005ce27cd5519b104c0d49e53ba78632b2bb /OpenSim/Services/AssetService/AssetServiceBase.cs
parentFormatting cleanup, ignore some generated files. (diff)
downloadopensim-SC_OLD-044446821b7d1d4550e43b0351c2611026874755.zip
opensim-SC_OLD-044446821b7d1d4550e43b0351c2611026874755.tar.gz
opensim-SC_OLD-044446821b7d1d4550e43b0351c2611026874755.tar.bz2
opensim-SC_OLD-044446821b7d1d4550e43b0351c2611026874755.tar.xz
Committing the meat of the user server interface and the bones of the service implementation
Diffstat (limited to 'OpenSim/Services/AssetService/AssetServiceBase.cs')
-rw-r--r--OpenSim/Services/AssetService/AssetServiceBase.cs22
1 files changed, 12 insertions, 10 deletions
diff --git a/OpenSim/Services/AssetService/AssetServiceBase.cs b/OpenSim/Services/AssetService/AssetServiceBase.cs
index c42d469..c60dd1f 100644
--- a/OpenSim/Services/AssetService/AssetServiceBase.cs
+++ b/OpenSim/Services/AssetService/AssetServiceBase.cs
@@ -46,23 +46,25 @@ namespace OpenSim.Services.AssetService
46 string connString = String.Empty; 46 string connString = String.Empty;
47 47
48 // 48 //
49 // Try reading the [DatabaseService] section first, if it exists 49 // Try reading the [AssetService] section first, if it exists
50 // 50 //
51 IConfig dbConfig = config.Configs["DatabaseService"]; 51 IConfig assetConfig = config.Configs["AssetService"];
52 if (dbConfig != null) 52 if (assetConfig != null)
53 { 53 {
54 dllName = dbConfig.GetString("StorageProvider", String.Empty); 54 dllName = assetConfig.GetString("StorageProvider", dllName);
55 connString = dbConfig.GetString("ConnectionString", String.Empty); 55 connString = assetConfig.GetString("ConnectionString", connString);
56 } 56 }
57 57
58 // 58 //
59 // Try reading the more specific [AssetService] section, if it exists 59 // Try reading the [DatabaseService] section, if it exists
60 // 60 //
61 IConfig assetConfig = config.Configs["AssetService"]; 61 IConfig dbConfig = config.Configs["DatabaseService"];
62 if (assetConfig != null) 62 if (dbConfig != null)
63 { 63 {
64 dllName = assetConfig.GetString("StorageProvider", dllName); 64 if (dllName != String.Empty)
65 connString = assetConfig.GetString("ConnectionString", connString); 65 dllName = dbConfig.GetString("StorageProvider", String.Empty);
66 if (connString != String.Empty)
67 connString = dbConfig.GetString("ConnectionString", String.Empty);
66 } 68 }
67 69
68 // 70 //