Merge branch 'master' into careminster

Conflicts:
2026-05-15 03:15:41 +08:00 · 2012-02-21 10:20:56 +00:00
parent ee62bf3c69 a27e5a9c95
commit 03e7bc1526
22 changed files with 67 additions and 978 deletions
--- a/OpenSim/Data/SQLite/SQLiteAssetData.cs
+++ b/OpenSim/Data/SQLite/SQLiteAssetData.cs
@@ -81,6 +81,9 @@ namespace OpenSim.Data.SQLite
        /// <param name="dbconnect">connect string</param>
        override public void Initialise(string dbconnect)
        {
+            if (Util.IsWindows())
+                Util.LoadArchSpecificWindowsDll("sqlite3.dll");
+
            if (dbconnect == string.Empty)
            {
                dbconnect = "URI=file:Asset.db,version=3";