aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2012-08-23 22:30:14 +0100
committerJustin Clark-Casey (justincc)2012-08-24 21:53:12 +0100
commitf1d4b8d83eadf0e15d66e456dd912288f5090a65 (patch)
tree84fe5c696aa32dfc174a239537657c6fd555c5d7
parentLock disposal of separate gdi+ objects under different threads since this pre... (diff)
downloadopensim-SC_OLD-f1d4b8d83eadf0e15d66e456dd912288f5090a65.zip
opensim-SC_OLD-f1d4b8d83eadf0e15d66e456dd912288f5090a65.tar.gz
opensim-SC_OLD-f1d4b8d83eadf0e15d66e456dd912288f5090a65.tar.bz2
opensim-SC_OLD-f1d4b8d83eadf0e15d66e456dd912288f5090a65.tar.xz
Add an [HGAssetService] section to SQLiteStandalone.ini with the same connection string as [AssetService].
This is necessary because commit 8131a24 (Tue Mar 27 10:08:13 2012) started passing the config section name rather than hardcoding "AssetService" This meant that the HG external-facing asset service tried to read ConnectionString from [HGAssetService] rather than [AssetService]. On SQLite, not finding this meant that it fell back to [DatabaseService], which is set for OpenSim.db rather than Asset.db. Therefore, all external asset requests returned null. Solution taken here is to create an [HGAssetService] section with the same ConnectionString as [AssetService]. This bug does not affect normal MySQL/MSSQL config since they use the [DatabaseService] connection string anyway. Addresses http://opensimulator.org/mantis/view.php?id=6200, many thanks to DanBanner for identifying the exact problem commit which was very helpful. This was a regression from OpenSimulator 0.7.3.1 which did not contain this bug.
-rw-r--r--bin/config-include/storage/SQLiteStandalone.ini10
1 files changed, 10 insertions, 0 deletions
diff --git a/bin/config-include/storage/SQLiteStandalone.ini b/bin/config-include/storage/SQLiteStandalone.ini
index c1de71a..67d98ff 100644
--- a/bin/config-include/storage/SQLiteStandalone.ini
+++ b/bin/config-include/storage/SQLiteStandalone.ini
@@ -7,6 +7,16 @@
7[AssetService] 7[AssetService]
8 ConnectionString = "URI=file:Asset.db,version=3" 8 ConnectionString = "URI=file:Asset.db,version=3"
9 9
10; The HGAssetService section controls the connection given to the AssetService in a Hypergrid configuration.
11; This has to be separate from [AssetService] because the Hypergrid facing connector uses [HGAssetService] for its config data instead.
12; However, the internal asset service will still use the [AssetService] section.
13; Therefore, you will almost certainly want the ConnectionString in [HGAssetService] to be the same as in [AssetService]
14; so that they both access the same database.
15; This issue does not apply to normal MySQL/MSSQL configurations, since by default they use the settings in [DatabaseService] and
16; do not have separate connection strings for different services.
17[HGAssetService]
18 ConnectionString = "URI=file:Asset.db,version=3"
19
10[InventoryService] 20[InventoryService]
11 ;ConnectionString = "URI=file:inventory.db,version=3" 21 ;ConnectionString = "URI=file:inventory.db,version=3"
12 ; if you have a legacy inventory store use the connection string below 22 ; if you have a legacy inventory store use the connection string below