aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data/SQLite/SQLiteInventoryStore.cs
diff options
context:
space:
mode:
authorMelanie2012-02-21 10:20:56 +0000
committerMelanie2012-02-21 10:20:56 +0000
commit03e7bc1526d24efe23f61f6a8dee88010ccfdb8c (patch)
treec2c2afef43a697dec1373ef5987f7d163031e5e2 /OpenSim/Data/SQLite/SQLiteInventoryStore.cs
parentMerge branch 'master' of ssh://3dhosting.de/var/git/careminster (diff)
parentBoth 32-bit and 64-bit BulletSim.dll must have the same name. Rename the 64 ... (diff)
downloadopensim-SC-03e7bc1526d24efe23f61f6a8dee88010ccfdb8c.zip
opensim-SC-03e7bc1526d24efe23f61f6a8dee88010ccfdb8c.tar.gz
opensim-SC-03e7bc1526d24efe23f61f6a8dee88010ccfdb8c.tar.bz2
opensim-SC-03e7bc1526d24efe23f61f6a8dee88010ccfdb8c.tar.xz
Merge branch 'master' into careminster
Conflicts:
Diffstat (limited to '')
-rw-r--r--OpenSim/Data/SQLite/SQLiteInventoryStore.cs3
1 files changed, 3 insertions, 0 deletions
diff --git a/OpenSim/Data/SQLite/SQLiteInventoryStore.cs b/OpenSim/Data/SQLite/SQLiteInventoryStore.cs
index 7dc07ec..ccbd154 100644
--- a/OpenSim/Data/SQLite/SQLiteInventoryStore.cs
+++ b/OpenSim/Data/SQLite/SQLiteInventoryStore.cs
@@ -77,6 +77,9 @@ namespace OpenSim.Data.SQLite
77 { 77 {
78 m_Initialized = true; 78 m_Initialized = true;
79 79
80 if (Util.IsWindows())
81 Util.LoadArchSpecificWindowsDll("sqlite3.dll");
82
80 if (dbconnect == string.Empty) 83 if (dbconnect == string.Empty)
81 { 84 {
82 dbconnect = "URI=file:inventoryStore.db,version=3"; 85 dbconnect = "URI=file:inventoryStore.db,version=3";