diff options
| author | Melanie Thielker | 2009-06-23 08:37:12 +0000 |
|---|---|---|
| committer | Melanie Thielker | 2009-06-23 08:37:12 +0000 |
| commit | 7f4a3392fced9cac79a39b23f564a6d2720812c9 (patch) | |
| tree | 31ff5ff71629f6bca04ed08d5af1d48f346e30f9 | |
| parent | update README to specify the correct mono revisions (diff) | |
| download | opensim-SC-7f4a3392fced9cac79a39b23f564a6d2720812c9.zip opensim-SC-7f4a3392fced9cac79a39b23f564a6d2720812c9.tar.gz opensim-SC-7f4a3392fced9cac79a39b23f564a6d2720812c9.tar.bz2 opensim-SC-7f4a3392fced9cac79a39b23f564a6d2720812c9.tar.xz | |
Fix the AssetServiceBase bug I introduced by reordering configuration load
order. Thanks, Grumly57, for pointing it out.
The point of the original change was to let the more specific setting override
the less specific one, actually, I disabled the use of the less specific one.
| -rw-r--r-- | OpenSim/Services/AssetService/AssetServiceBase.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Services/AssetService/AssetServiceBase.cs b/OpenSim/Services/AssetService/AssetServiceBase.cs index c60dd1f..86752f9 100644 --- a/OpenSim/Services/AssetService/AssetServiceBase.cs +++ b/OpenSim/Services/AssetService/AssetServiceBase.cs | |||
| @@ -61,9 +61,9 @@ namespace OpenSim.Services.AssetService | |||
| 61 | IConfig dbConfig = config.Configs["DatabaseService"]; | 61 | IConfig dbConfig = config.Configs["DatabaseService"]; |
| 62 | if (dbConfig != null) | 62 | if (dbConfig != null) |
| 63 | { | 63 | { |
| 64 | if (dllName != String.Empty) | 64 | if (dllName == String.Empty) |
| 65 | dllName = dbConfig.GetString("StorageProvider", String.Empty); | 65 | dllName = dbConfig.GetString("StorageProvider", String.Empty); |
| 66 | if (connString != String.Empty) | 66 | if (connString == String.Empty) |
| 67 | connString = dbConfig.GetString("ConnectionString", String.Empty); | 67 | connString = dbConfig.GetString("ConnectionString", String.Empty); |
| 68 | } | 68 | } |
| 69 | 69 | ||