diff options
author | Justin Clarke Casey | 2009-05-15 18:50:38 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2009-05-15 18:50:38 +0000 |
commit | 3791386d4d017c00c40c8768f9433e44f06e4bbb (patch) | |
tree | a6df62f3530085a41eb5ac085311848d9fdd90c5 /OpenSim | |
parent | Added PostInitialise method to IGridPlugin. (diff) | |
download | opensim-SC-3791386d4d017c00c40c8768f9433e44f06e4bbb.zip opensim-SC-3791386d4d017c00c40c8768f9433e44f06e4bbb.tar.gz opensim-SC-3791386d4d017c00c40c8768f9433e44f06e4bbb.tar.bz2 opensim-SC-3791386d4d017c00c40c8768f9433e44f06e4bbb.tar.xz |
* Change default sqlite asset db back to Asset.db instead of AssetStorage.db
* This inconsistency has actually existed for some time but only the recent change brought it to light
* In the past, the default in ConfigurationLoader took precedence over the one in SQLiteAssetData
Diffstat (limited to 'OpenSim')
-rw-r--r-- | OpenSim/Data/SQLite/SQLiteAssetData.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Data/SQLite/SQLiteAssetData.cs b/OpenSim/Data/SQLite/SQLiteAssetData.cs index 41a75a3..ae60d24 100644 --- a/OpenSim/Data/SQLite/SQLiteAssetData.cs +++ b/OpenSim/Data/SQLite/SQLiteAssetData.cs | |||
@@ -73,7 +73,7 @@ namespace OpenSim.Data.SQLite | |||
73 | { | 73 | { |
74 | if (dbconnect == string.Empty) | 74 | if (dbconnect == string.Empty) |
75 | { | 75 | { |
76 | dbconnect = "URI=file:AssetStorage.db,version=3"; | 76 | dbconnect = "URI=file:Asset.db,version=3"; |
77 | } | 77 | } |
78 | m_conn = new SqliteConnection(dbconnect); | 78 | m_conn = new SqliteConnection(dbconnect); |
79 | m_conn.Open(); | 79 | m_conn.Open(); |
@@ -334,7 +334,7 @@ namespace OpenSim.Data.SQLite | |||
334 | /// </summary> | 334 | /// </summary> |
335 | override public void Initialise() | 335 | override public void Initialise() |
336 | { | 336 | { |
337 | Initialise("URI=file:AssetStorage.db,version=3"); | 337 | Initialise("URI=file:Asset.db,version=3"); |
338 | } | 338 | } |
339 | 339 | ||
340 | /// <summary> | 340 | /// <summary> |